From f1bdfcc8708cb7ab462d36ab2878add957a5f5fa Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 31 Dec 2010 14:57:00 +0000 Subject: [PATCH] Don't log whether or not a request on a client connection that isn't kept alive has been crunched. It doesn't actually matter anymore. --- jcc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jcc.c b/jcc.c index 582c8826..0b376c13 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.334 2010/12/26 16:18:30 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 $ @@ -2594,16 +2594,14 @@ 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. Server connection: keep-alive %u, tainted: %u, " - "socket alive %u. Client connection: crunched: %u, " - "socket alive: %u. Server timeout: %u. " + "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), - 0 != (csp->flags & CSP_FLAG_CRUNCHED), socket_is_still_alive(csp->cfd), csp->server_connection.keep_alive_timeout, config_file_change_detected); -- 2.39.2