[privoxy-commits] current parsers.c,1.249,1.250

[Fabian K. <fab...@us...>]

Update of /cvsroot/ijbswa/current
In directory vz-cvs-4.sog:/tmp/cvs-serv32664

Modified Files:
	parsers.c 
Log Message:
After preventing the client from pipeling, don't signal keep-alive intentions

When looking at the response headers alone, it previously wasn't
obvious from the client's perspective that no additional responses
should be expected.

This might improve compatibility with Opera (#3464439).


Index: parsers.c
===================================================================
RCS file: /cvsroot/ijbswa/current/parsers.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -C2 -d -r1.249 -r1.250
*** parsers.c	4 Sep 2012 08:33:17 -0000	1.249
--- parsers.c	4 Sep 2012 08:38:31 -0000	1.250
***************
*** 1890,1894 ****
     {
  #ifdef FEATURE_CONNECTION_KEEP_ALIVE
!       if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING))
        {
            if (!strcmpic(csp->http->ver, "HTTP/1.1"))
--- 1890,1895 ----
     {
  #ifdef FEATURE_CONNECTION_KEEP_ALIVE
!       if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
!         && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED))
        {
            if (!strcmpic(csp->http->ver, "HTTP/1.1"))
***************
*** 1922,1926 ****
        }
     }
!    else if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE))
     {
        log_error(LOG_LEVEL_HEADER,
--- 1923,1928 ----
        }
     }
!    else if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
!         && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED))
     {
        log_error(LOG_LEVEL_HEADER,
***************
*** 3713,3716 ****
--- 3715,3719 ----
  
     if (!(csp->flags & CSP_FLAG_CLIENT_HEADER_PARSING_DONE)
+      && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
       && (csp->flags & CSP_FLAG_CLIENT_CONNECTION_HEADER_SET))
     {
***************
*** 3720,3723 ****
--- 3723,3727 ----
  #ifdef FEATURE_CONNECTION_KEEP_ALIVE
     if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
+       && !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
        && (csp->http->ssl == 0)
        && !strcmpic(csp->http->ver, "HTTP/1.1"))