remm 02/02/22 10:03:54
Modified: catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch HttpRequestBase.java
Log:
- Port patch.
- The contentType header should be trimmed before comparing
with "application/x-www-form-urlencoded".
- Fixes bug 6644.
Revision Changes Path
No revision
No revision
1.31.2.1 +8 -5
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.31
retrieving revision 1.31.2.1
diff -u -r1.31 -r1.31.2.1
--- HttpRequestBase.java 12 Sep 2001 03:04:12 -0000 1.31
+++ HttpRequestBase.java 22 Feb 2002 18:03:54 -0000 1.31.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.31 2001/09/12 03:04:12 remm Exp $
- * $Revision: 1.31 $
- * $Date: 2001/09/12 03:04:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.31.2.1 2002/02/22 18:03:54 remm Exp $
+ * $Revision: 1.31.2.1 $
+ * $Date: 2002/02/22 18:03:54 $
*
* ====================================================================
*
@@ -102,7 +102,7 @@
* be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.31 $ $Date: 2001/09/12 03:04:12 $
+ * @version $Revision: 1.31.2.1 $ $Date: 2002/02/22 18:03:54 $
*/
public class HttpRequestBase
@@ -630,8 +630,11 @@
if (contentType == null)
contentType = "";
int semicolon = contentType.indexOf(';');
- if (semicolon >= 0)
+ if (semicolon >= 0) {
contentType = contentType.substring(0, semicolon).trim();
+ } else {
+ contentType = contentType.trim();
+ }
if ("POST".equals(getMethod()) && (getContentLength() > 0)
&& (this.stream == null)
&& "application/x-www-form-urlencoded".equals(contentType)) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
