Author: markt
Date: Thu Mar 24 13:24:28 2011
New Revision: 1084949
URL: http://svn.apache.org/viewvc?rev=1084949&view=rev
Log:
Resolve some TODOs for "swallowAbortedUploads"
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1084949&r1=1084948&r2=1084949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Thu Mar
24 13:24:28 2011
@@ -95,6 +95,7 @@ public class CometEventImpl implements C
}
boolean iscomet = request.isComet();
request.setComet(false);
+ request.finishRequest();
response.finishResponse();
if (iscomet) request.cometClose();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1084949&r1=1084948&r2=1084949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Mar
24 13:24:28 2011
@@ -314,6 +314,7 @@ public class CoyoteAdapter implements Ad
}
}
if (!request.isAsync() && !comet) {
+ request.finishRequest();
response.finishResponse();
req.action(ActionCode.POST_REQUEST , null);
}
@@ -417,6 +418,7 @@ public class CoyoteAdapter implements Ad
if (asyncConImpl != null) {
async = true;
} else if (!comet) {
+ request.finishRequest();
response.finishResponse();
if (postParseSuccess) {
// Log only if processing was invoked.
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1084949&r1=1084948&r2=1084949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Mar 24
13:24:28 2011
@@ -792,10 +792,13 @@ public class Request
* @exception IOException if an input/output error occurs
*/
public void finishRequest() throws IOException {
- // The reader and input stream don't need to be closed
- // TODO: Is this ever called?
- // If so, move input swallow disabling from
- // Response.finishResponse() to here
+ // Optionally disable swallowing of additional request data.
+ Context context = getContext();
+ if (context != null &&
+ response.getStatus() ==
HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE &&
+ !context.getSwallowAbortedUploads()) {
+ coyoteRequest.action(ActionCode.DISABLE_SWALLOW_INPUT, null);
+ }
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1084949&r1=1084948&r2=1084949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Mar 24
13:24:28 2011
@@ -49,7 +49,6 @@ import org.apache.catalina.core.Applicat
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.DateTool;
-import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.UEncoder;
import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -498,15 +497,6 @@ public class Response
*/
public void finishResponse()
throws IOException {
- // Optionally disable swallowing of additional request data.
- // TODO: Should be in Request.finishRequest(), but that method
- // seems to get called never.
- Context context = getContext();
- if (context != null
- && getStatus() ==
HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE
- && !context.getSwallowAbortedUploads()) {
- coyoteResponse.action(ActionCode.DISABLE_SWALLOW_INPUT, null);
- }
// Writing leftover bytes
outputBuffer.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
