httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1443075 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/proxy/mod_proxy_connect.c
Date Wed, 06 Feb 2013 17:13:59 GMT
Author: jim
Date: Wed Feb  6 17:13:59 2013
New Revision: 1443075

URL: http://svn.apache.org/viewvc?rev=1443075&view=rev
Log:
Merge r1442320 from trunk:

Don't keepalive the connection to the client if the
backend closes the connection.

PR: 54474
Submitted by: Pavel Mateja <pavel netsafe cz>

Submitted by: sf
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1442320

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1443075&r1=1443074&r2=1443075&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Feb  6 17:13:59 2013
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) mod_proxy_connect: Don't keepalive the connection to the client if the
+     backend closes the connection. PR 54474. [Pavel Mateja <pavel netsafe cz>]
+
   *) mod_lua: Add bindings for mod_dbd/apr_dbd database access.
      [Daniel Gruno]
      

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1443075&r1=1443074&r2=1443075&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Feb  6 17:13:59 2013
@@ -91,12 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_proxy_connect: Don't keep open connection to client after backend
-    closes connection
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1442320
-    2.4.x patch: trunk patch works modulo CHANGES
-    +1: sf, jim, trawick, rjung
-
   * Fix incomplete filename in ErrorLog when trying to access files in non existing
     directories (PR 39944)
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1442412

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c?rev=1443075&r1=1443074&r2=1443075&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c Wed Feb  6 17:13:59 2013
@@ -487,6 +487,7 @@ static int proxy_connect_handler(request
         ap_lingering_close(backconn);
 
     c->aborted = 1;
+    c->keepalive = AP_CONN_CLOSE;
 
     return OK;
 }



Mime
View raw message