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 15:43:01 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
jfclere 2002/11/22 06:43:01
Modified: jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Arrange HEAD handling.
That fixes 14293. Thanks to Martin Kraemer for his help.
Revision Changes Path
1.31 +8 -3 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_jk.c 18 Oct 2002 10:23:15 -0000 1.30
+++ mod_jk.c 22 Nov 2002 14:43:00 -0000 1.31
@@ -354,6 +354,11 @@
}
}
+ if (p->r->header_only) {
+ ap_bflush(bf);
+ return JK_TRUE;
+ }
+
while(len && !p->r->connection->aborted) {
w = ap_bwrite(p->r->connection->client, &buf[r], len);
if (w > 0) {
@@ -470,12 +475,12 @@
/* get server name */
/* s->server_name = (char *)(r->hostname ? r->hostname : r->server->server_hostname); */
/* XXX : � la jk2 */
- s->server_name = ap_get_server_name(r);
+ s->server_name = (char *) ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
/* s->server_port = htons( r->connection->local_addr.sin_port ); */
/* XXX : � la jk2 */
- s->server_port = ap_get_server_port(r);
+ s->server_port = ap_get_server_port(r);
s->server_software = (char *)ap_get_server_version();
1.59 +7 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mod_jk.c 28 Oct 2002 14:38:07 -0000 1.58
+++ mod_jk.c 22 Nov 2002 14:43:00 -0000 1.59
@@ -364,6 +364,12 @@
return JK_FALSE;
}
}
+ if (p->r->header_only) {
+#ifndef AS400
+ ap_rflush(p->r);
+#endif
+ return JK_TRUE;
+ }
#ifdef AS400
rc = ap_change_response_body_xlate(p->r, 65535, 65535); /* turn off response body translation*/
if(rc){
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>