add another step in the windows release process

[privoxy.git] / filters.c

diff --git a/filters.c b/filters.c
index 95fbe8d..ab20038 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1246,8 +1246,9 @@ struct http_response *redirect_url(struct client_state *csp)
          }
          new_url = rewrite_url(requested_url, redirection_string);
 #ifdef FEATURE_HTTPS_INSPECTION
-         if (client_use_ssl(csp))
+         if (requested_url != csp->http->url)
          {
+            assert(client_use_ssl(csp));
             freez(requested_url);
          }
 #endif
@@ -1276,19 +1277,7 @@ struct http_response *redirect_url(struct client_state *csp)
       new_url = get_last_url(old_url, redirect_mode);
       freez(old_url);
    }
-
-   /*
-    * Disable redirect checkers, so that they
-    * will be only run more than once if the user
-    * also enables them through tags.
-    *
-    * From a performance point of view
-    * it doesn't matter, but the duplicated
-    * log messages are annoying.
-    */
-   csp->action->flags &= ~ACTION_FAST_REDIRECTS;
 #endif /* def FEATURE_FAST_REDIRECTS */
-   csp->action->flags &= ~ACTION_REDIRECT;
 
    /* Did any redirect action trigger? */
    if (new_url)
@@ -1704,8 +1693,8 @@ static char *pcrs_filter_impl(const struct client_state *csp, int filter_respons
       }
       else
       {
-         log_error(LOG_LEVEL_RE_FILTER,
-            "filtering client %s request body (size %lu) with \'%s\' produced %d hits (new size %lu).",
+         log_error(LOG_LEVEL_RE_FILTER, "filtering request body from client %s "
+            "(size %lu) with \'%s\' produced %d hits (new size %lu).",
             csp->ip_addr_str, prev_size, b->name, current_hits, size);
       }
 #ifdef FEATURE_EXTENDED_STATISTICS