From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 11 Aug 2004 22:46:31 +0000 (+0000)
Subject: Bounding to client connection is not needed(?).
X-Git-Tag: post_ajp_proxy~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b663aafd6cddbd5a5122a4cae898cc2f9e525b0;p=apache

Bounding to client connection is not needed(?).
Since AJP can serve multiple request trough the same
backend connection, no need to create separate conn_rec.
For now comment out all the set/get module config.

Submitted by: mturk


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

diff --git a/modules/proxy/proxy_ajp.c b/modules/proxy/proxy_ajp.c
index bed82af5bf..e40fcf4351 100644
--- a/modules/proxy/proxy_ajp.c
+++ b/modules/proxy/proxy_ajp.c
@@ -334,10 +334,12 @@ int ap_proxy_ajp_handler(request_rec *r, proxy_worker *worker,
     /* only use stored info for top-level pages. Sub requests don't share 
      * in keepalives
      */
+#if 0
     if (!r->main) {
         backend = (proxy_conn_rec *) ap_get_module_config(c->conn_config,
                                                       &proxy_ajp_module);
     }
+#endif
     /* create space for state information */
     if (!backend) {
         status = ap_proxy_acquire_connection(scheme, &backend, worker, r->server);
@@ -364,11 +366,12 @@ int ap_proxy_ajp_handler(request_rec *r, proxy_worker *worker,
 
     if (status != OK)
         goto cleanup;
-
     /* Step Two: Make the Connection */
     status = ap_proxy_connect_backend(scheme, backend, worker, r->server);
     if (status != OK)
         goto cleanup;
+#if 0
+    /* XXX: we don't need to create the bound client connection */
 
     /* Step Three: Create conn_rec */
     if (!backend->connection) {
@@ -376,6 +379,7 @@ int ap_proxy_ajp_handler(request_rec *r, proxy_worker *worker,
         if (status != OK)
             goto cleanup;
     }
+#endif
    
    
     /* Step Four: Send the Request */
@@ -388,8 +392,10 @@ int ap_proxy_ajp_handler(request_rec *r, proxy_worker *worker,
     status = ap_proxy_ajp_process_response(p, r, origin, backend,
                                            conf, server_portstr);
 cleanup:
+#if 0
     /* Clear the module config */
     ap_set_module_config(c->conn_config, &proxy_ajp_module, NULL);
+#endif
     /* Do not close the socket */
     ap_proxy_release_connection(scheme, backend, r->server);
     return status;