remm 01/06/17 17:21:58
Modified: catalina/src/share/org/apache/catalina/connector/http
SocketInputStream.java
Log:
- Handle HTTP/0.9 requests.
Revision Changes Path
1.7 +8 -4
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SocketInputStream.java 2001/01/23 03:53:00 1.6
+++ SocketInputStream.java 2001/06/18 00:21:58 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java,v
1.6 2001/01/23 03:53:00 remm Exp $
- * $Revision: 1.6 $
- * $Date: 2001/01/23 03:53:00 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java,v
1.7 2001/06/18 00:21:58 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/06/18 00:21:58 $
*
* ====================================================================
*
@@ -250,6 +250,8 @@
space = false;
+ boolean eol = false;
+
while (!space) {
// if the buffer is full, extend it
if (readCount >= maxRead) {
@@ -275,6 +277,10 @@
}
if (buf[pos] == SP) {
space = true;
+ } else if ((buf[pos] == CR) || (buf[pos] == LF)) {
+ // HTTP/0.9 style request
+ eol = true;
+ space = true;
}
requestLine.uri[readCount] = (char) buf[pos];
readCount++;
@@ -288,8 +294,6 @@
maxRead = requestLine.protocol.length;
readStart = pos;
readCount = 0;
-
- boolean eol = false;
while (!eol) {
// if the buffer is full, extend it
