X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.c;h=0b376c13be34a1db584d520d8f4c9abcbe080c4d;hb=f1bdfcc8708cb7ab462d36ab2878add957a5f5fa;hp=31952a1bf6e186d49c854120cb2341b24c317658;hpb=b10b908f0e2c9d3138f2945cfe5b52545bca0015;p=privoxy.git

diff --git a/jcc.c b/jcc.c
index 31952a1b..0b376c13 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.324 2010/07/21 14:35:09 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.335 2010/12/26 16:20:08 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -1151,14 +1151,20 @@ static void verify_request_length(struct client_state *csp)
  *********************************************************************/
 static void mark_server_socket_tainted(struct client_state *csp)
 {
+   /*
+    * For consistency we always mark the server socket
+    * tainted, however, to reduce the log noise we only
+    * emit a log message if the server socket could have
+    * actually been reused.
+    */
    if ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
       && !(csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED))
    {
       log_error(LOG_LEVEL_CONNECT,
          "Marking the server socket %d tainted.",
          csp->server_connection.sfd);
-      csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
    }
+   csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
 }
 
 /*********************************************************************
@@ -1521,9 +1527,7 @@ static void chat(struct client_state *csp)
    const struct forward_spec *fwd;
    struct http_request *http;
    long len = 0; /* for buffer sizes (and negative error codes) */
-
-   /* Function that does the content filtering for the current request */
-   filter_function_ptr content_filter = NULL;
+   int buffer_and_filter_content = 0;
 
    /* Skeleton for HTTP response, if we should intercept the request */
    struct http_response *rsp;
@@ -2049,11 +2053,11 @@ static void chat(struct client_state *csp)
                 * now is the time to apply content modification
                 * and send the result to the client.
                 */
-               if (content_filter)
+               if (buffer_and_filter_content)
                {
-                  p = execute_content_filter(csp, content_filter);
+                  p = execute_content_filters(csp);
                   /*
-                   * If the content filter fails, use the original
+                   * If content filtering fails, use the original
                    * buffer and length.
                    * (see p != NULL ? p : csp->iob->cur below)
                    */
@@ -2115,7 +2119,7 @@ static void chat(struct client_state *csp)
           */
          if (server_body || http->ssl)
          {
-            if (content_filter)
+            if (buffer_and_filter_content)
             {
                /*
                 * If there is no memory left for buffering the content, or the buffer limit
@@ -2163,7 +2167,7 @@ static void chat(struct client_state *csp)
                    */
                   byte_count = (unsigned long long)flushed;
                   freez(hdr);
-                  content_filter = NULL;
+                  buffer_and_filter_content = 0;
                   server_body = 1;
                }
             }
@@ -2330,12 +2334,12 @@ static void chat(struct client_state *csp)
 
             if (!http->ssl) /* We talk plaintext */
             {
-               content_filter = get_filter_function(csp);
+               buffer_and_filter_content = content_requires_filtering(csp);
             }
             /*
              * Only write if we're not buffering for content modification
              */
-            if (!content_filter)
+            if (!buffer_and_filter_content)
             {
                /*
                 * Write the server's (modified) header to
@@ -2483,6 +2487,7 @@ static void serve(struct client_state *csp)
    do
    {
       unsigned int latency;
+      int config_file_change_detected = 0; /* Only used for debugging */
 
       chat(csp);
 
@@ -2517,6 +2522,12 @@ static void serve(struct client_state *csp)
          }
       }
 
+      if (continue_chatting && any_loaded_file_changed(csp->config->config_file_list))
+      {
+         continue_chatting = 0;
+         config_file_change_detected = 1;
+      }
+
       if (continue_chatting)
       {
          unsigned int client_timeout;
@@ -2556,7 +2567,7 @@ static void serve(struct client_state *csp)
             {
                time_t time_open = time(NULL) - csp->server_connection.timestamp;
 
-               if (csp->server_connection.keep_alive_timeout < time_open + latency)
+               if (csp->server_connection.keep_alive_timeout < time_open - (time_t)latency)
                {
                   break;
                }
@@ -2583,8 +2594,17 @@ static void serve(struct client_state *csp)
       else if (csp->server_connection.sfd != JB_INVALID_SOCKET)
       {
          log_error(LOG_LEVEL_CONNECT,
-            "The connection on server socket %d to %s isn't reusable. "
-            "Closing.", csp->server_connection.sfd, csp->server_connection.host);
+            "The connection on server socket %d to %s isn't reusable. Closing. "
+            "Server connection: keep-alive %u, tainted: %u, socket alive %u. "
+            "Client connection: socket alive: %u. Server timeout: %u. "
+            "Configuration file change detected: %u",
+            csp->server_connection.sfd, csp->server_connection.host,
+            0 != (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE),
+            0 != (csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED),
+            socket_is_still_alive(csp->server_connection.sfd),
+            socket_is_still_alive(csp->cfd),
+            csp->server_connection.keep_alive_timeout,
+            config_file_change_detected);
       }
    } while (continue_chatting);
 
@@ -3455,12 +3475,14 @@ static void listen_loop(void)
             exit(1);
          }
 #endif
-         freez(csp);
+         freez(csp_list);
          continue;
       }
       else
       {
-         log_error(LOG_LEVEL_CONNECT, "accepted connection from %s", csp->ip_addr_str);
+         log_error(LOG_LEVEL_CONNECT,
+            "accepted connection from %s on socket %d",
+            csp->ip_addr_str, csp->cfd);
       }
 
 #ifdef FEATURE_TOGGLE
@@ -3482,7 +3504,7 @@ static void listen_loop(void)
          log_error(LOG_LEVEL_CONNECT, "Connection from %s dropped due to ACL", csp->ip_addr_str);
          close_socket(csp->cfd);
          freez(csp->ip_addr_str);
-         freez(csp);
+         freez(csp_list);
          continue;
       }
 #endif /* def FEATURE_ACL */
@@ -3497,7 +3519,7 @@ static void listen_loop(void)
             strlen(TOO_MANY_CONNECTIONS_RESPONSE));
          close_socket(csp->cfd);
          freez(csp->ip_addr_str);
-         freez(csp);
+         freez(csp_list);
          continue;
       }