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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1443075 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0c69683781e28e491c7c1c01a8934bb2fd9ac0a9..d9e327409ad17d96927750116041113d7c514aa7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
      

diff --git a/STATUS b/STATUS
index d668d652990741654bf496e02eb11ab290011bb4..9971182369beb6cd2c5c07cc263e1c8dd89e9c20 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
index 5664983d4916df1ac5f05f57881ff1e44ffa58ad..b38edc91f44d5d79d590e4b131ba837a77b12878 100644 (file)
--- a/modules/proxy/mod_proxy_connect.c
+++ b/modules/proxy/mod_proxy_connect.c
@@ -487,6 +487,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
         ap_lingering_close(backconn);
 
     c->aborted = 1;
+    c->keepalive = AP_CONN_CLOSE;
 
     return OK;
 }