keith 01/05/18 21:23:44
Modified: src/native/apache1.3 Tag: tomcat_32 mod_jk.c
src/native/apache2.0 Tag: tomcat_32 mod_jk.c
Log:
mod_jk should be passing the raw, possibly encoded URI to Tomcat;
see <http://java.sun.com/products/servlet/errata_042700.html>
for this requirement. Standalone Tomcat is compliant, only
mod_jk needed to be changed.
Revision Changes Path
No revision
No revision
1.7.2.4 +7 -1 jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- mod_jk.c 2001/02/17 05:24:00 1.7.2.3
+++ mod_jk.c 2001/05/19 04:23:41 1.7.2.4
@@ -358,7 +358,13 @@
s->method = (char *)r->method;
s->content_length = get_content_length(r);
s->query_string = r->args;
- s->req_uri = r->uri;
+ s->req_uri = r->unparsed_uri;
+ if (s->req_uri != NULL) {
+ char *query_str = strchr(s->req_uri, '?');
+ if (query_str != NULL) {
+ *query_str = 0;
+ }
+ }
s->is_ssl = JK_FALSE;
s->ssl_cert = NULL;
No revision
No revision
1.6.2.1 +7 -1 jakarta-tomcat/src/native/apache2.0/Attic/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/apache2.0/Attic/mod_jk.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- mod_jk.c 2000/06/23 10:35:39 1.6
+++ mod_jk.c 2001/05/19 04:23:43 1.6.2.1
@@ -318,7 +318,13 @@
s->method = (char *)r->method;
s->content_length = get_content_length(r);
s->query_string = r->args;
- s->req_uri = r->uri;
+ s->req_uri = r->unparsed_uri;
+ if (s->req_uri != NULL) {
+ char *query_str = strchr(s->req_uri, '?');
+ if (query_str != NULL) {
+ *query_str = 0;
+ }
+ }
s->is_ssl = JK_FALSE;
s->ssl_cert = NULL;
