You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2002/11/22 17:04:06 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
jfclere 2002/11/22 08:04:06
Modified: jk/native2/server/apache13 jk_service_apache13.c
jk/native2/server/apache2 jk_service_apache2.c
Log:
Fix 14293 - Copied from mod_jk -
Revision Changes Path
1.9 +6 -4 jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
Index: jk_service_apache13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_service_apache13.c 27 Sep 2002 17:49:01 -0000 1.8
+++ jk_service_apache13.c 22 Nov 2002 16:04:05 -0000 1.9
@@ -215,8 +215,6 @@
return JK_ERR;
{
- /* BUFF *bf = p->r->connection->client; */
- /* size_t w = (size_t)l; */
size_t rd = 0;
long ll=len;
char *bb=(char *)b;
@@ -232,11 +230,15 @@
return rc;
}
}
+ if (rr->header_only) {
+ ap_bflush(rr);
+ return JK_OK;
+ }
/* Debug - try to get around rwrite */
while( ll > 0 ) {
unsigned long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
- rd = ap_rwrite((const char *)bb, toSend, s->ws_private );
+ rd = ap_rwrite((const char *)bb, toSend, rr );
if( s->uriEnv->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
"service.write() %ld (%ld) out of %ld \n",toSend, rd, ll );
@@ -252,7 +254,7 @@
/*
* To allow server push. After writing full buffers
*/
- ap_bflush(s->ws_private);
+ ap_bflush(rr);
}
return JK_OK;
}
1.32 +8 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_service_apache2.c 26 Oct 2002 12:38:45 -0000 1.31
+++ jk_service_apache2.c 22 Nov 2002 16:04:06 -0000 1.32
@@ -282,11 +282,16 @@
}
}
}
+
+ if (rr->header_only) {
+ ap_rflush(rr);
+ return JK_OK;
+ }
/* Debug - try to get around rwrite */
while( ll > 0 ) {
unsigned long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
- r = ap_rwrite((const char *)bb, toSend, s->ws_private );
+ r = ap_rwrite((const char *)bb, toSend, rr );
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "service.write() %ld (%ld) out of %ld \n",toSend, r, ll ); */
ll-=CHUNK_SIZE;
@@ -301,7 +306,7 @@
/*
* To allow server push. After writing full buffers
*/
- if(ap_rflush(s->ws_private) != APR_SUCCESS) {
+ if(ap_rflush(rr) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
NULL, "mod_jk: Error flushing \n" );
return JK_ERR;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>