mturk 2002/11/20 09:25:41
Modified: jk/native2/common jk_workerEnv.c jk_handler_response.c
Log:
For stream channels (sockets) use the supplied msg for
getChunk handler.
Revision Changes Path
1.58 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- jk_workerEnv.c 11 Nov 2002 15:40:34 -0000 1.57
+++ jk_workerEnv.c 20 Nov 2002 17:25:41 -0000 1.58
@@ -525,7 +525,7 @@
msg->dump( env, msg, "Apache->tomcat" );
rc = ep->worker->channel->send(env, ep->worker->channel, ep,
- ep->post );
+ msg );
if (rc < 0) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.processCallbacks() error sending response
data\n");
1.26 +1 -0
jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Index: jk_handler_response.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_handler_response.c 20 Nov 2002 16:41:15 -0000 1.25
+++ jk_handler_response.c 20 Nov 2002 17:25:41 -0000 1.26
@@ -241,6 +241,7 @@
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "handler_request.getChunk() - read len=%d\n",len); */
+ msg->reset(env, msg);
len=msg->appendFromServer( env, msg, r, ae, len );
/* the right place to add file storage for upload */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
