Index: SocketInputStream.java
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java,v
retrieving revision 1.5
diff -u -r1.5 SocketInputStream.java
--- SocketInputStream.java	2001/01/04 19:49:20	1.5
+++ SocketInputStream.java	2001/01/08 10:45:19
@@ -164,18 +164,15 @@
         
         // Checking for a blank line
         int chr = 0;
-        do { // Skipping CR or LF
-            try {
+        try {
+            do { // Skipping CR or LF
                 chr = read();
-            } catch (IOException e) {
-                chr = -1;
-            }
-        } while ((chr == CR) || (chr == LF));
-        if (chr == -1)
+            } while ((chr == CR) || (chr == LF));
+
+            pos--;
+        } catch (IOException e) {
             throw new EOFException
                 (sm.getString("requestStream.readline.error"));
-        if ((chr != CR) || (chr != LF)) {
-            pos--;
         }
 
         // Reading the method name