Author: mturk
Date: Sat Oct 18 06:35:57 2008
New Revision: 705882
URL: http://svn.apache.org/viewvc?rev=705882&view=rev
Log:
Make sure the message reply buffer is always reset before sending request. Do a
real reset by clearing the message to zero, not just marking it's size
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=705882&r1=705881&r2=705882&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Oct 18
06:35:57 2008
@@ -2159,7 +2159,6 @@
JK_TRACE_EXIT(l);
return JK_SERVER_ERROR;
}
- jk_b_reset(op->reply);
op->post = jk_b_new(&(p->pool));
if (!op->post) {
@@ -2211,6 +2210,9 @@
aw->s->max_busy = aw->s->busy;
retry_interval = p->worker->retry_interval;
for (i = 0; i < aw->retries; i++) {
+ /* Reset reply message buffer for each retry */
+ jk_b_reset(op->reply);
+
/*
* ajp_send_request() already locally handles
* reconnecting and broken connection detection.
Modified: tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c?rev=705882&r1=705881&r2=705882&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_msg_buff.c Sat Oct 18 06:35:57
2008
@@ -40,6 +40,10 @@
{
msg->len = 4;
msg->pos = 4;
+ if (msg->buf && msg->maxlen) {
+ /* Clear the message buffer */
+ memset(msg->buf, 0, msg->maxlen);
+ }
}
int jk_b_append_long(jk_msg_buf_t *msg, unsigned long val)
@@ -105,7 +109,7 @@
if (!msg) {
return NULL;
}
-
+ memset(msg, 0, sizeof(jk_msg_buf_t));
msg->pool = p;
return msg;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
