costin 01/09/16 17:44:55
Modified: . build.xml
src/facade22/org/apache/tomcat/facade
RequestDispatcherImpl.java
Log:
#2641, thanks Daniele Gaffuri for reporting the bug.
Also, removed the (unused) container/tomcat-startup.jar
Revision Changes Path
1.152 +0 -5 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- build.xml 2001/09/07 04:25:20 1.151
+++ build.xml 2001/09/17 00:44:54 1.152
@@ -387,11 +387,6 @@
<include name="org/apache/tomcat/startup/**"/>
<exclude name="**/EmbededTomcat.java" unless="jdk12.present"/>
</javac>
- <jar jarfile="${tomcat.build}/lib/container/tomcat-startup.jar"
- basedir="${tomcat.build}/classes"
- manifest="src/build/manifests/manifest.startup">
- <include name="org/apache/tomcat/startup/**"/>
- </jar>
<jar jarfile="${tomcat.build}/lib/common/etomcat.jar"
basedir="${tomcat.build}/classes"
1.22 +8 -4
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RequestDispatcherImpl.java 2001/08/26 01:47:41 1.21
+++ RequestDispatcherImpl.java 2001/09/17 00:44:55 1.22
@@ -236,16 +236,20 @@
// Process existing parameters, if not already done so
// ( otherwise we'll process some twice )
realRequest.parameters().handleQueryParameters();
- // Set the query string - the sum of the old one and new one.
+ // Set the query string - the sum of the new one and old one.
String oldQS=realRequest.queryString().toString();
- String newQS=(oldQS==null ) ? queryString : oldQS + "&" +
- queryString;
+ String newQS=(oldQS==null ) ? queryString : queryString + "&" +
+ oldQS;
realRequest.queryString().setString(newQS);
// Process the additional parsm. We don't know if the old
// params were processed ( so we need to make sure they are,
// i.e. a known state ).
- realRequest.parameters().processParameters( queryString );
+ realRequest.parameters().push();
+ Parameters child=realRequest.parameters().getCurrentSet();
+
+ child.processParameters( queryString );
+ //realRequest.parameters().processParameters( queryString );
}
// run the new request through the context manager
