Merge r378032 from trunk:

  *) mod_proxy: Fix KeepAlives not being allowed and set to
     backend servers. PR38602. [Ruediger Pluem, Jim Jagielski]

Also, document previous patch:
  *) Correctly initialize mod_proxy workers, which use a
     combination of local and shared datasets. Adjust logging
     to better trace usage. PR38403. [Jim Jagielski]

Reviewed by: jim

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

diff --git a/CHANGES b/CHANGES
index 460e03e6fe1fe47e8ad8dc016c7c52cbc8648213..ed9d9deea4db1c4e1749f0691aafe5a2df6cdb30 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) mod_proxy: Fix KeepAlives not being allowed and set to
+       backend servers. PR38602. [Ruediger Pluem, Jim Jagielski]
+
   *) Fix instdso.sh "sed syntax error" installation issue on some
      platforms.  PR 38108.  [Masaoki Kobayashi <masaoki techfirm.co.jp>]
 

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 40455fb85ba86497ee545e82c5822531a052b044..4b98da51390a904e2a1fade50a05b35c19739810 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -984,9 +984,18 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
 
 /* Yes I hate gotos.  This is the subrequest shortcut */
 skip_body:
-    /* Handle Connection: header */
-    if (!force10 && p_conn->close) {
-        buf = apr_pstrdup(p, "Connection: close" CRLF);
+    /*
+     * Handle Connection: header if we do HTTP/1.1 request:
+     * If we plan to close the backend connection sent Connection: close
+     * otherwise sent Connection: Keep-Alive.
+     */
+    if (!force10) {
+        if (p_conn->close) {
+            buf = apr_pstrdup(p, "Connection: close" CRLF);
+        }
+        else {
+            buf = apr_pstrdup(p, "Connection: Keep-Alive" CRLF);
+        }
         ap_xlate_proto_to_ascii(buf, strlen(buf));
         e = apr_bucket_pool_create(buf, strlen(buf), p, c->bucket_alloc);
         APR_BRIGADE_INSERT_TAIL(header_brigade, e);
@@ -1513,12 +1522,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
 
                     /* found the last brigade? */
                     if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
-                        /* if this is the last brigade, cleanup the
-                         * backend connection first to prevent the
-                         * backend server from hanging around waiting
-                         * for a slow client to eat these bytes
-                         */
-                        backend->close = 1;
                         /* signal that we must leave */
                         finish = TRUE;
                     }
@@ -1587,18 +1590,7 @@ static
 apr_status_t ap_proxy_http_cleanup(const char *scheme, request_rec *r,
                                    proxy_conn_rec *backend)
 {
-    /* If there are no KeepAlives, or if the connection has been signalled
-     * to close, close the socket and clean up
-     */
-
-    /* if the connection is < HTTP/1.1, or Connection: close,
-     * we close the socket, otherwise we leave it open for KeepAlive support
-     */
-    if (backend->close || (r->proto_num < HTTP_VERSION(1,1))) {
-        backend->close_on_recycle = 1;
-        ap_set_module_config(r->connection->conn_config, &proxy_http_module, NULL);
-        ap_proxy_release_connection(scheme, backend, r->server);
-    }
+    ap_proxy_release_connection(scheme, backend, r->server);
     return OK;
 }
 
@@ -1676,26 +1668,13 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
              "proxy: HTTP: serving URL %s", url);
 
 
-    /* only use stored info for top-level pages. Sub requests don't share
-     * in keepalives
-     */
-    if (!r->main) {
-        backend = (proxy_conn_rec *) ap_get_module_config(c->conn_config,
-                                                      &proxy_http_module);
-    }
     /* create space for state information */
-    if (!backend) {
-        if ((status = ap_proxy_acquire_connection(proxy_function, &backend,
-                                                  worker, r->server)) != OK)
-            goto cleanup;
+    if ((status = ap_proxy_acquire_connection(proxy_function, &backend,
+                                              worker, r->server)) != OK)
+        goto cleanup;
 
-        if (!r->main) {
-            ap_set_module_config(c->conn_config, &proxy_http_module, backend);
-        }
-    }
 
     backend->is_ssl = is_ssl;
-    backend->close_on_recycle = 1;
 
     /* Step One: Determine Who To Connect To */
     if ((status = ap_proxy_determine_connection(p, r, conf, worker, backend,
@@ -1735,10 +1714,8 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
 
 cleanup:
     if (backend) {
-        if (status != OK) {
+        if (status != OK)
             backend->close = 1;
-            backend->close_on_recycle = 1;
-        }
         ap_proxy_http_cleanup(proxy_function, r, backend);
     }
     return status;

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 1fa9b2f78431a05f5cd2fc962ea3e5d7e142861d..d6855976681d0e475712dada7103b05c4f2054dc 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1844,16 +1844,6 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
             conn->hostname = apr_pstrdup(conn->pool, uri->hostname);
             conn->port = uri->port;
         }
-    }
-    /*
-     * TODO: add address cache for generic forward proxies.
-     * At least level 0 -> compare with previous hostname:port
-     */
-    if (r->proxyreq == PROXYREQ_PROXY || r->proxyreq == PROXYREQ_REVERSE ||
-        !worker->is_address_reusable) {
-        /*
-         * TODO: Check if the connection can be reused
-         */
         if (conn->connection) {
             if (conn->sock) {
                 apr_socket_close(conn->sock);