craigmcc 01/04/25 14:39:21
Modified: catalina/src/share/org/apache/catalina/connector
HttpRequestBase.java RequestBase.java
catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
Log:
Correct the implementation of ServletRequest.getCharacterEncoding() to return
null if the request does not include a character encoding, as specified in the
Javadocs. If you call request.getReader() on a request with no character
encoding, the server will still use ISO-8859-1 as required by the spec.
Revision Changes Path
1.20 +6 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java
Index: HttpRequestBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- HttpRequestBase.java 2001/03/30 23:23:19 1.19
+++ HttpRequestBase.java 2001/04/25 21:39:15 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.19 2001/03/30 23:23:19 craigmcc Exp $
- * $Revision: 1.19 $
- * $Date: 2001/03/30 23:23:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.20 2001/04/25 21:39:15 craigmcc Exp $
+ * $Revision: 1.20 $
+ * $Date: 2001/04/25 21:39:15 $
*
* ====================================================================
*
@@ -100,7 +100,7 @@
* be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.19 $ $Date: 2001/03/30 23:23:19 $
+ * @version $Revision: 1.20 $ $Date: 2001/04/25 21:39:15 $
*/
public class HttpRequestBase
@@ -580,6 +580,8 @@
results.setLocked(false);
String encoding = getCharacterEncoding();
+ if (encoding == null)
+ encoding = "ISO-8859-1";
// Parse any parameters specified in the query string
String queryString = getQueryString();
1.10 +7 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java
Index: RequestBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RequestBase.java 2000/12/22 18:58:00 1.9
+++ RequestBase.java 2001/04/25 21:39:16 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
1.9 2000/12/22 18:58:00 craigmcc Exp $
- * $Revision: 1.9 $
- * $Date: 2000/12/22 18:58:00 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
1.10 2001/04/25 21:39:16 craigmcc Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/04/25 21:39:16 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* the connector-specific methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2000/12/22 18:58:00 $
+ * @version $Revision: 1.10 $ $Date: 2001/04/25 21:39:16 $
*/
public abstract class RequestBase
@@ -690,10 +690,7 @@
*/
public String getCharacterEncoding() {
- if (this.characterEncoding == null)
- return ("ISO-8859-1");
- else
- return (this.characterEncoding);
+ return (this.characterEncoding);
}
@@ -841,6 +838,8 @@
if (reader == null) {
String encoding = getCharacterEncoding();
+ if (encoding == null)
+ encoding = "ISO-8859-1";
InputStreamReader isr =
new InputStreamReader(createInputStream(), encoding);
reader = new BufferedReader(isr);
1.4 +6 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationHttpRequest.java 2001/01/30 04:14:49 1.3
+++ ApplicationHttpRequest.java 2001/04/25 21:39:20 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
1.3 2001/01/30 04:14:49 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2001/01/30 04:14:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
1.4 2001/04/25 21:39:20 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/04/25 21:39:20 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/01/30 04:14:49 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/25 21:39:20 $
*/
class ApplicationHttpRequest extends HttpServletRequestWrapper {
@@ -451,6 +451,8 @@
HashMap queryParameters = new HashMap();
String encoding = getCharacterEncoding();
+ if (encoding == null)
+ encoding = "ISO-8859-1";
try {
RequestUtil.parseParameters
(queryParameters, queryString, encoding);
