From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 23 Oct 2011 11:23:35 +0000 (+0000)
Subject: Enable sharing of server connections again, even if the client doesn't support keep... 
X-Git-Tag: v_3_0_18~73
X-Git-Url: http://www.privoxy.org/gitweb/seealso.html?a=commitdiff_plain;h=4fa68e2920544ec5d2585fe3e9efd65363e46032;p=privoxy.git

Enable sharing of server connections again, even if the client doesn't support keep-alive
---

diff --git a/jcc.c b/jcc.c
index 7400f184..8df9d73b 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.368 2011/10/23 11:18:53 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.369 2011/10/23 11:22:16 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -2515,7 +2515,9 @@ static void serve(struct client_state *csp)
          && ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
              || (csp->flags & CSP_FLAG_CRUNCHED))
          && (csp->cfd != JB_INVALID_SOCKET)
-         && (csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE);
+         && ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
+             || (csp->config->feature_flags &
+                RUNTIME_FEATURE_CONNECTION_SHARING));
 
       if (continue_chatting && !(csp->flags & CSP_FLAG_CRUNCHED))
       {