glenn 2003/01/02 04:58:58
Modified: jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Make sure http errors are handled by Apache if not handled by Tomcat
Revision Changes Path
1.34 +6 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_jk.c 16 Dec 2002 08:54:55 -0000 1.33
+++ mod_jk.c 2 Jan 2003 12:58:57 -0000 1.34
@@ -1609,6 +1609,11 @@
jk_close_pool(&private_data.p);
if(rc) {
+ /* If tomcat returned no body and the status is not OK,
+ let apache handle the error code */
+ if( !r->sent_bodyct && r->status != HTTP_OK ) {
+ return r->status;
+ }
return OK; /* NOT r->status, even if it has changed. */
}
}
1.64 +6 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- mod_jk.c 30 Dec 2002 04:05:39 -0000 1.63
+++ mod_jk.c 2 Jan 2003 12:58:57 -0000 1.64
@@ -1834,6 +1834,11 @@
jk_close_pool(&private_data.p);
if(rc) {
+ /* If tomcat returned no body and the status is not OK,
+ let apache handle the error code */
+ if( !r->sent_bodyct && r->status != HTTP_OK ) {
+ return r->status;
+ }
return OK; /* NOT r->status, even if it has changed. */
} else
return HTTP_INTERNAL_SERVER_ERROR;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
