From 0ceaaf991830945e10a9d94ef991e19936926345 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 17 Jun 2006 00:12:20 +0000
Subject: [PATCH] Revert, if Content-Length: <some large value> is an
 acceptable work around

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@414965 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/http11/Http11AprProcessor.java    | 16 +++-------------
 .../org/apache/coyote/http11/InternalAprInputBuffer.java | 11 -----------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 6c3181104..841e81fc9 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -743,19 +743,9 @@ public class Http11AprProcessor implements ActionHook {
         
         try {
             rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
-            int data = inputBuffer.readSocketData();
-            if ( data > 0 ) {
-                int contentLength = request.getContentLength();
-                if (contentLength>=0) request.setContentLength(contentLength + data);
-                for (int i=0; i<inputBuffer.activeFilters.length; i++) {
-                    //this resets the remaining flag and the content length on the filter
-                    //if we don't do this, then request.getInputStream.read will return 0
-                    if (inputBuffer.activeFilters[i]!=null) inputBuffer.activeFilters[i].setRequest(request);
-                }
-                error = !adapter.event(request, response, error);
-                if (request.getAttribute("org.apache.tomcat.comet") == null) {
-                    comet = false;
-                }
+            error = !adapter.event(request, response, error);
+            if (request.getAttribute("org.apache.tomcat.comet") == null) {
+                comet = false;
             }
         } catch (InterruptedIOException e) {
             error = true;
diff --git a/java/org/apache/coyote/http11/InternalAprInputBuffer.java b/java/org/apache/coyote/http11/InternalAprInputBuffer.java
index fffde339c..699e2f8c1 100644
--- a/java/org/apache/coyote/http11/InternalAprInputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalAprInputBuffer.java
@@ -350,17 +350,6 @@ public class InternalAprInputBuffer implements InputBuffer {
         }
 
     }
-    
-    public int readSocketData() {
-        bbuf.clear();
-        int nRead = Socket.recvbbt(socket, 0, buf.length - lastValid, readTimeout);
-        if (nRead > 0) {
-            bbuf.limit(nRead);
-            bbuf.get(buf, pos, nRead);
-            lastValid = pos + nRead;
-        }
-        return nRead>=0?nRead:-1;
-    }
 
 
     /**
-- 
2.11.0