remm 00/11/16 23:25:36
Modified: catalina/src/share/org/apache/catalina/connector/http
SocketInputStream.java
Log:
- Skip extra CRLF before starting reading the request line, as is heavily
recommended to do that in the HTTP spec.
Revision Changes Path
1.2 +12 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java
Index: SocketInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketInputStream.java 2000/11/17 03:30:43 1.1
+++ SocketInputStream.java 2000/11/17 07:25:36 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java,v
1.1 2000/11/17 03:30:43 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/17 03:30:43 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java,v
1.2 2000/11/17 07:25:36 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/17 07:25:36 $
*
* ====================================================================
*
@@ -161,6 +161,15 @@
if (requestLine.methodEnd != 0)
requestLine.recycle();
+ // Checking for a blank line
+ int chr = 0;
+ while ((chr = read()) == CR) { // Skipping CR
+ read(); // Skipping LF
+ }
+ if (chr != CR) {
+ pos--;
+ }
+
// Reading the method name
int maxRead = requestLine.method.length;
