mturk 2004/08/06 10:41:25
Modified: ajp/proxy proxy_ajp.c
Log:
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.
Revision Changes Path
1.13 +7 -1 jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c
Index: proxy_ajp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- proxy_ajp.c 6 Aug 2004 17:12:00 -0000 1.12
+++ proxy_ajp.c 6 Aug 2004 17:41:25 -0000 1.13
@@ -334,10 +334,12 @@
/* 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 @@
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 @@
if (status != OK)
goto cleanup;
}
+#endif
/* Step Four: Send the Request */
@@ -388,8 +392,10 @@
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
