Author: rjung
Date: Tue Mar 15 15:43:48 2016
New Revision: 1735112
URL: http://svn.apache.org/viewvc?rev=1735112&view=rev
Log:
Status Worker: Fix displayed number of bytes
read from and written to the backend when an
AJP worker is used without a load balancer worker.
The byte counters for the request were reset
in the balancer worker code, so when used
without a balancer the numbers were never reset
and the bytes per request were instead
accumulated byte counts.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1735112&r1=1735111&r2=1735112&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Tue Mar 15 15:43:48 2016
@@ -2500,6 +2500,11 @@ static int JK_METHOD ajp_service(jk_endp
return JK_FALSE;
}
+ /* Reset endpoint read and write sizes for
+ * this request.
+ */
+ e->rd = e->wr = 0;
+ e->recoverable = JK_TRUE;
p = e->endpoint_private;
aw = p->worker;
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1735112&r1=1735111&r2=1735112&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Tue Mar 15 15:43:48 2016
@@ -1349,11 +1349,6 @@ static int JK_METHOD service(jk_endpoint
jk_uint64_t rd = 0;
jk_uint64_t wr = 0;
int busy;
- /* Reset endpoint read and write sizes for
- * this request.
- */
- end->rd = end->wr = 0;
- end->recoverable = JK_TRUE;
if (p->worker->lblock == JK_LB_LOCK_PESSIMISTIC)
jk_shm_lock();
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1735112&r1=1735111&r2=1735112&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Mar 15 15:43:48 2016
@@ -45,6 +45,11 @@
<subsection name="Native">
<changelog>
<fix>
+ Status: Fix displayed number of bytes read from and written
+ to the backend when an AJP worker is used without a load
+ balancer worker. (rjung)
+ </fix>
+ <fix>
Apache: Don't try to read remaining request body parts during
clean up if reading the request body from the client already
failed during earlier processing phases. (rjung)
@@ -503,7 +508,7 @@
environment variable JK_STATELESS. (rjung)
</add>
<update>
- AJP: Improve logging when request does not fix into an AJP packet.
(rjung)
+ AJP: Improve logging when request does not fit into an AJP packet.
(rjung)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
