X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.c;h=048a3f4a469519e743120ffa68a1eae943e8f837;hb=4d8eca65bd4a6eefe57197c80ef41849f0f9874d;hp=cb846ca86e8f71f6e45306b84ada9c73e3638fb9;hpb=624a05d0884af835e34984f4198ffece3189f9a5;p=privoxy.git

diff --git a/jcc.c b/jcc.c
index cb846ca8..048a3f4a 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.300 2009/10/04 15:46:25 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.306 2009/12/22 13:04:10 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -724,19 +724,21 @@ static void send_crunch_response(const struct client_state *csp, struct http_res
       status_code[2] = rsp->head[11];
       status_code[3] = '\0';
 
+      /* Log that the request was crunched and why. */
+      log_error(LOG_LEVEL_CRUNCH, "%s: %s", crunch_reason(rsp), http->url);
+      log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" %s %u",
+         csp->ip_addr_str, http->ocmd, status_code, rsp->content_length);
+
       /* Write the answer to the client */
       if (write_socket(csp->cfd, rsp->head, rsp->head_length)
        || write_socket(csp->cfd, rsp->body, rsp->content_length))
       {
          /* There is nothing we can do about it. */
-         log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", csp->http->host);
+         log_error(LOG_LEVEL_ERROR,
+            "Couldn't deliver the error message through client socket %d: %E",
+            csp->cfd);
       }
 
-      /* Log that the request was crunched and why. */
-      log_error(LOG_LEVEL_CRUNCH, "%s: %s", crunch_reason(rsp), http->url);
-      log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" %s %u",
-         csp->ip_addr_str, http->ocmd, status_code, rsp->content_length);
-
       /* Clean up and return */
       if (cgi_error_memory() != rsp)
       {
@@ -1603,7 +1605,9 @@ static void chat(struct client_state *csp)
    /* Skeleton for HTTP response, if we should intercept the request */
    struct http_response *rsp;
    struct timeval timeout;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
    int watch_client_socket = 1;
+#endif
 
    memset(buf, 0, sizeof(buf));
 
@@ -2514,33 +2518,37 @@ static void serve(struct client_state *csp)
          && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
          && (csp->cfd != JB_INVALID_SOCKET)
          && (csp->server_connection.sfd != JB_INVALID_SOCKET)
-         && socket_is_still_usable(csp->server_connection.sfd)
-         && (latency < csp->server_connection.keep_alive_timeout);
+         && socket_is_still_usable(csp->server_connection.sfd);
 
       if (continue_chatting)
       {
-         unsigned int client_timeout;
-
          if (!(csp->flags & CSP_FLAG_SERVER_KEEP_ALIVE_TIMEOUT_SET))
          {
-            log_error(LOG_LEVEL_CONNECT, "The server didn't specify how long "
-               "the connection will stay open. Assume it's only a second.");
-            csp->server_connection.keep_alive_timeout = 1;
+            csp->server_connection.keep_alive_timeout = csp->config->default_server_timeout;
+            log_error(LOG_LEVEL_CONNECT,
+               "The server didn't specify how long the connection will stay open. "
+               "Assumed timeout is: %u.", csp->server_connection.keep_alive_timeout);
          }
+         continue_chatting = (latency < csp->server_connection.keep_alive_timeout);
+      }
+
+      if (continue_chatting)
+      {
+         unsigned int client_timeout;
 
          client_timeout = (unsigned)csp->server_connection.keep_alive_timeout - latency;
 
          log_error(LOG_LEVEL_CONNECT,
-            "Waiting for the next client request. "
+            "Waiting for the next client request on socket %d. "
             "Keeping the server socket %d to %s open.",
-            csp->server_connection.sfd, csp->server_connection.host);
-
+            csp->cfd, csp->server_connection.sfd, csp->server_connection.host);
          if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
             && data_is_available(csp->cfd, (int)client_timeout)
             && socket_is_still_usable(csp->cfd))
          {
             log_error(LOG_LEVEL_CONNECT, "Client request arrived in "
-               "time or the client closed the connection.");
+               "time or the client closed the connection on socket %d.",
+                csp->cfd);
             /*
              * Get the csp in a mostly vergin state again.
              * XXX: Should be done elsewhere.
@@ -2570,7 +2578,8 @@ static void serve(struct client_state *csp)
          else
          {
             log_error(LOG_LEVEL_CONNECT,
-               "No additional client request received in time.");
+               "No additional client request received in time on socket %d.",
+                csp->cfd);
 #ifdef FEATURE_CONNECTION_SHARING
             if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
                && (socket_is_still_usable(csp->server_connection.sfd)))
@@ -2616,7 +2625,10 @@ static void serve(struct client_state *csp)
    if (csp->server_connection.sfd != JB_INVALID_SOCKET)
    {
 #ifdef FEATURE_CONNECTION_SHARING
-      forget_connection(csp->server_connection.sfd);
+      if (csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
+      {
+         forget_connection(csp->server_connection.sfd);
+      }
 #endif /* def FEATURE_CONNECTION_SHARING */
       close_socket(csp->server_connection.sfd);
    }
@@ -3106,9 +3118,6 @@ int main(int argc, char **argv)
 #if defined(unix)
 {
    pid_t pid = 0;
-#if 0
-   int   fd;
-#endif
 
    if (!no_daemon)
    {
@@ -3136,23 +3145,9 @@ int main(int argc, char **argv)
          exit( 0 );
       }
       /* child */
-#if 1
-      /* Should be more portable, but not as well tested */
+
       setsid();
-#else /* !1 */
-#ifdef __FreeBSD__
-      setpgrp(0,0);
-#else /* ndef __FreeBSD__ */
-      setpgrp();
-#endif /* ndef __FreeBSD__ */
-      fd = open("/dev/tty", O_RDONLY);
-      if ( fd )
-      {
-         /* no error check here */
-         ioctl( fd, TIOCNOTTY,0 );
-         close ( fd );
-      }
-#endif /* 1 */
+
       /*
        * stderr (fd 2) will be closed later on,
        * when the config file has been parsed.