tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r698853 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Date Thu, 25 Sep 2008 08:08:00 GMT
Author: mturk
Date: Thu Sep 25 01:07:59 2008
New Revision: 698853

URL: http://svn.apache.org/viewvc?rev=698853&view=rev
Log:
Move code after variable declaration. Thanks Tim

Modified:
    tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=698853&r1=698852&r2=698853&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Thu Sep 25 01:07:59 2008
@@ -2365,23 +2365,26 @@
                     end->done(&end, xconf->log);
                     if (s.content_read < s.content_length ||
                         (s.is_chunked && !s.no_more_chunks)) {
-                        if (JK_IS_DEBUG_LEVEL(xconf->log))
-                           jk_log(xconf->log, JK_LOG_DEBUG,
-                                  "Consuming remaining request data for worker=%s",
-                                  STRNULL_FOR_NULL(worker_name));
                         /*
                          * If the servlet engine didn't consume all of the
                          * request data, consume and discard all further
                          * characters left to read from client
                          */
                         char *buff = apr_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(xconf->log)) {
+                           jk_log(xconf->log, JK_LOG_DEBUG,
+                                  "Consumed %d bytes of remaining request data for worker=%s",
+                                  consumed, STRNULL_FOR_NULL(worker_name));
+                        }
                     }
                 }
                 else {            /* this means we couldn't get an endpoint */



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message