mturk 2004/08/10 11:00:17
Modified: ajp/proxy mod_proxy.c
Log:
Make sure that if the pre_request was called that the post_request
gets called too, no mather what the error code is.
Revision Changes Path
1.34 +8 -5 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_proxy.c 10 Aug 2004 14:58:24 -0000 1.33
+++ mod_proxy.c 10 Aug 2004 18:00:16 -0000 1.34
@@ -631,7 +631,7 @@
/* an error or success */
if (access_status != DECLINED && access_status != HTTP_BAD_GATEWAY)
{
- return access_status;
+ goto cleanup;
}
/* we failed to talk to the upstream proxy */
}
@@ -653,12 +653,15 @@
"If you are using a DSO version of mod_proxy, make sure "
"the proxy submodules are included in the configuration "
"using LoadModule.", r->uri);
- return HTTP_FORBIDDEN;
+ access_status = HTTP_FORBIDDEN;
+ goto cleanup;
}
+
+cleanup:
if (balancer) {
- access_status = proxy_run_post_request(worker, balancer, r, conf);
- if (access_status == DECLINED) {
- access_status = OK; /* no post_request handler available */
+ int post_status = proxy_run_post_request(worker, balancer, r, conf);
+ if (post_status == DECLINED) {
+ post_status = OK; /* no post_request handler available */
/* TODO: reclycle direct worker */
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
