markt 2004/09/28 14:51:50
Modified: catalina/src/conf web.xml
catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
webapps/tomcat-docs cgi-howto.xml
Log:
Revert RFE 27090 as it introduced a JDK 1.4 dependency
Revision Changes Path
1.59 +0 -4 jakarta-tomcat-4.0/catalina/src/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- web.xml 17 Aug 2004 21:44:32 -0000 1.58
+++ web.xml 28 Sep 2004 21:51:49 -0000 1.59
@@ -236,10 +236,6 @@
<!-- executable Name of the exectuable used to run the -->
<!-- script. [perl] -->
<!-- -->
- <!-- parameterEncoding Name of parameter encoding to be used with -->
- <!-- CGI servlet. -->
- <!-- [System.getProperty("file.encoding","UTF-8")] -->
- <!-- -->
<!-- passShellEnvironment Should the shell environment variables (if -->
<!-- any) be passed to the CGI script? [false] -->
<!-- -->
1.28 +6 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CGIServlet.java 26 Aug 2004 21:38:13 -0000 1.27
+++ CGIServlet.java 28 Sep 2004 21:51:49 -0000 1.28
@@ -263,10 +263,6 @@
/** the executable to use with the script */
private String cgiExecutable = "perl";
- /** the encoding to use for parameters */
- private String parameterEncoding = System.getProperty("file.encoding",
- "UTF-8");
-
/** object used to ensure multiple threads don't try to expand same file */
static Object expandFileLock = new Object();
@@ -768,8 +764,7 @@
if (param != null) {
String values[] = req.getParameterValues(param);
for (int i=0; i < values.length; i++) {
- String value = URLEncoder.encode(values[i],
- parameterEncoding);
+ String value = URLEncoder.encode(values[i]);
NameValuePair nvp = new NameValuePair(param, value);
queryParameters.add(nvp);
}
1.6 +0 -3 jakarta-tomcat-4.0/webapps/tomcat-docs/cgi-howto.xml
Index: cgi-howto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/cgi-howto.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cgi-howto.xml 17 Aug 2004 21:44:32 -0000 1.5
+++ cgi-howto.xml 28 Sep 2004 21:51:50 -0000 1.6
@@ -56,9 +56,6 @@
by this servlet. Default 0.</li>
<li><strong>executable</strong> - The of the executable to be used to
run the script. Default is <code>perl</code>.</li>
-<li><strong>parameterEncoding</strong> - Name of the parameter encoding
-to be used with the GCI servlet. Default is
-<code>System.getProperty("file.encoding","UTF-8")</code>.</li>
<li><strong>passShellEnvironment</strong> - Should the shell environment
variables (if any) be passed to the CGI script? Default is
<code>false</code>.</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
