Move string_move() into miscutil.c and make it extern

[privoxy.git] / gateway.c

diff --git a/gateway.c b/gateway.c
index ac13c23..ae706cf 100644 (file)
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,4 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.88 2012/10/17 18:11:19 fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.91 2012/10/21 12:56:38 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@ -212,7 +212,7 @@ void remember_connection(const struct reusable_connection *connection)
    if (!free_slot_found)
    {
       log_error(LOG_LEVEL_CONNECT,
-        "No free slots found to remembering socket for %s:%d. Last slot %d.",
+        "No free slots found to remember socket for %s:%d. Last slot %d.",
         connection->host, connection->port, slot);
       privoxy_mutex_unlock(&connection_reuse_mutex);
       close_socket(connection->sfd);
@@ -228,6 +228,7 @@ void remember_connection(const struct reusable_connection *connection)
    reusable_connection[slot].request_sent = connection->request_sent;
    reusable_connection[slot].response_received = connection->response_received;
    reusable_connection[slot].keep_alive_timeout = connection->keep_alive_timeout;
+   reusable_connection[slot].requests_sent_total = connection->requests_sent_total;
 
    assert(reusable_connection[slot].gateway_host == NULL);
    assert(reusable_connection[slot].gateway_port == 0);
@@ -261,7 +262,6 @@ void remember_connection(const struct reusable_connection *connection)
 #endif /* def FEATURE_CONNECTION_SHARING */
 
 
-#ifdef FEATURE_CONNECTION_KEEP_ALIVE
 /*********************************************************************
  *
  * Function    :  mark_connection_closed
@@ -284,13 +284,13 @@ void mark_connection_closed(struct reusable_connection *closed_connection)
    closed_connection->request_sent = 0;
    closed_connection->response_received = 0;
    closed_connection->keep_alive_timeout = 0;
+   closed_connection->requests_sent_total = 0;
    closed_connection->forwarder_type = SOCKS_NONE;
    freez(closed_connection->gateway_host);
    closed_connection->gateway_port = 0;
    freez(closed_connection->forward_host);
    closed_connection->forward_port = 0;
 }
-#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
 
 
 #ifdef FEATURE_CONNECTION_SHARING
@@ -494,13 +494,14 @@ static jb_socket get_reusable_connection(const struct http_request *http,
             reusable_connection[slot].in_use = TRUE;
             sfd = reusable_connection[slot].sfd;
             log_error(LOG_LEVEL_CONNECT,
-               "Found reusable socket %d for %s:%d in slot %d. "
-               "Timestamp made %d seconds ago. Timeout: %d. Latency: %d.",
+               "Found reusable socket %d for %s:%d in slot %d. Timestamp made %d "
+               "seconds ago. Timeout: %d. Latency: %d. Requests served: %d",
                sfd, reusable_connection[slot].host, reusable_connection[slot].port,
                slot, time(NULL) - reusable_connection[slot].timestamp,
                reusable_connection[slot].keep_alive_timeout,
                (int)(reusable_connection[slot].response_received -
-               reusable_connection[slot].request_sent));
+               reusable_connection[slot].request_sent),
+               reusable_connection[slot].requests_sent_total);
             break;
          }
       }