glenn 2003/03/15 18:59:44
Modified: jk/native CHANGES.txt
jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
When a client aborted but Apache 2 tried to do a SSI include
of a JSP or servlet an error was being logged. Updated code
to do initial check for aborted client to after mod_jk has
determined that it should handle the request. Also now
return OK instead of HTTP_INTERNAL_SERVER_ERROR so that
an unable to include error isn't logged when a client
aborted their request.
Fixed a bug in JkRequestLogFormat which could improperly
format logging of request URI's which included % escape
characters.
Revision Changes Path
1.12 +5 -2 jakarta-tomcat-connectors/jk/native/CHANGES.txt
Index: CHANGES.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/CHANGES.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CHANGES.txt 14 Mar 2003 13:36:35 -0000 1.11
+++ CHANGES.txt 16 Mar 2003 02:59:43 -0000 1.12
@@ -18,7 +18,10 @@
* Fixed a bug in Apache 2.0 which caused a POST request forwarded to
Tomcat to fail if it generated SSI directives which were post
processed by mod_include. [glenn]
-
+ * Fixed a bug in JkRequestLogFormat when printing the request URI that
+ could cause a URI with hex escapes sequences to be formatted wrong.
+ [glenn]
+
Changes with JK 1.2.2:
* tomcat_trend.pl updated script to support changed logging of
aborted requests
1.36 +2 -2 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_jk.c 7 Jan 2003 01:27:11 -0000 1.35
+++ mod_jk.c 16 Mar 2003 02:59:43 -0000 1.36
@@ -883,7 +883,7 @@
s += strl[i];
}
*s = 0;
- jk_log(conf->log ? conf->log : main_log,JK_LOG_REQUEST,str);
+ jk_log(conf->log ? conf->log : main_log, JK_LOG_REQUEST, "%s", str);
}
/*****************************************************************
1.68 +9 -9 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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mod_jk.c 14 Mar 2003 13:36:35 -0000 1.67
+++ mod_jk.c 16 Mar 2003 02:59:44 -0000 1.68
@@ -977,7 +977,7 @@
}
*s = 0;
- jk_log(conf->log, JK_LOG_REQUEST, str);
+ jk_log(conf->log, JK_LOG_REQUEST, "%s", str);
}
/*****************************************************************
@@ -1660,11 +1660,6 @@
jk_server_conf_t *conf;
int rc,dmt=1;
- /* If the remote client has aborted, just return */
- if (r->connection->aborted) {
- return HTTP_INTERNAL_SERVER_ERROR;
- }
-
/* We do DIR_MAGIC_TYPE here to make sure TC gets all requests, even
* if they are directory requests, in case there are no static files
* visible to Apache and/or DirectoryIndex was not used. This is only
@@ -1740,8 +1735,13 @@
if(worker_name) {
jk_worker_t *worker = wc_get_worker_for_name(worker_name, xconf->log);
+ /* If the remote client has aborted, just ignore the request */
+ if (r->connection->aborted) {
+ return OK;
+ }
+
if(worker) {
- struct timeval tv_begin,tv_end;
+ struct timeval tv_begin,tv_end;
int rc = JK_FALSE;
apache_private_data_t private_data;
jk_ws_service_t s;
@@ -1845,7 +1845,7 @@
return OK; /* NOT r->status, even if it has changed. */
} else if (rc == JK_CLIENT_ERROR) {
r->connection->aborted = 1;
- return HTTP_INTERNAL_SERVER_ERROR;
+ return OK;
} else {
return HTTP_INTERNAL_SERVER_ERROR;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
