Author: fhanik
Date: Fri Jun 16 17:12:20 2006
New Revision: 414965
URL: http://svn.apache.org/viewvc?rev=414965&view=rev
Log:
Revert, if Content-Length: <some large value> is an acceptable work around
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=414965&r1=414964&r2=414965&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Fri Jun 16 17:12:20 2006
@@ -743,19 +743,9 @@
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;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=414965&r1=414964&r2=414965&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Fri Jun 16 17:12:20 2006
@@ -350,17 +350,6 @@
}
}
-
- 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;
- }
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
