Author: rjung
Date: Sun Mar 25 13:25:01 2012
New Revision: 1305028
URL: http://svn.apache.org/viewvc?rev=1305028&view=rev
Log:
Reduce code drift between HTTPD 1.3 and 2.x variants of mod_jk:
- add log message about comsuming remaining request data.
It was originally added to the 2.x variant in r698229 and
changed further in r698853.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1305028&r1=1305027&r2=1305028&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Mar 25 13:25:01 2012
@@ -2505,7 +2505,6 @@ static int jk_handler(request_rec * r)
if (worker->get_endpoint(worker, &end, conf->log)) {
rc = end->service(end, &s, conf->log, &is_error);
end->done(&end, conf->log);
-
if (s.content_read < s.content_length ||
(s.is_chunked && !s.no_more_chunks)) {
/*
@@ -2514,13 +2513,20 @@ static int jk_handler(request_rec * r)
* characters left to read from client
*/
char *buff = ap_palloc(r->pool, 2048);
+ int consumed = 0;
if (buff != NULL) {
int rd;
while ((rd =
ap_get_client_block(r, buff, 2048)) > 0) {
s.content_read += rd;
+ consumed += rd;
}
}
+ if (JK_IS_DEBUG_LEVEL(conf->log)) {
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Consumed %d bytes of remaining request data
for worker=%s",
+ consumed, STRNULL_FOR_NULL(worker_name));
+ }
}
}
#ifndef NO_GETTIMEOFDAY
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
