From 9f163fc9065fa71f90a33b3d8a11488483dad2ed Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 21 Oct 2012 14:40:44 +0000 Subject: [PATCH] In serve(), stop considering connection sharing a reason to keep the client socket open This should have been committed with 1.396. --- jcc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jcc.c b/jcc.c index 8f912caf..5d4e777c 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.404 2012/10/21 13:04:08 fabiankeil Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.405 2012/10/21 13:04:34 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -2630,9 +2630,7 @@ static void serve(struct client_state *csp) & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE) && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED) && (csp->cfd != JB_INVALID_SOCKET) - && ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE) - || (csp->config->feature_flags & - RUNTIME_FEATURE_CONNECTION_SHARING)); + && (csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE); if (!(csp->flags & CSP_FLAG_CRUNCHED) && (csp->server_connection.sfd != JB_INVALID_SOCKET)) -- 2.39.2