mod_proxy_http: Use the "Connection: close" header for requests to

backends not recycling connections (disablereuse), including the default
reverse and forward proxies.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1658765 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 4a0d059c6e790fc5c8d80962a8fd3ea8f674af6f..1197bf42fefbfc750b6bada085feda319f1b4b62 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@ Changes with Apache 2.5.0
      calls r:wsupgrade() can cause a child process crash. 
      [Edward Lu <Chaosed0 gmail.com>]
 
+  *) mod_proxy_http: Use the "Connection: close" header for requests to
+     backends not recycling connections (disablereuse), including the default
+     reverse and forward proxies.  [Yann Ylavic]
+
   *) mod_proxy_http: Don't expect the backend to ack the "Connection: close" to
      finally close those not meant to be kept alive by SetEnv proxy-nokeepalive
      or force-proxy-request-1.0, and respond with 502 instead of 400 if its

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 0a27a52d50785c82913312241464821937a120f4..6298014b75e892fe0a5b06dedb42123de4464220 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -974,7 +974,7 @@ skip_body:
      * otherwise sent Connection: Keep-Alive.
      */
     if (!force10) {
-        if (p_conn->close) {
+        if (!ap_proxy_connection_reusable(p_conn)) {
             buf = apr_pstrdup(p, "Connection: close" CRLF);
         }
         else {