Author: billbarker
Date: Sun Jun 10 13:37:18 2007
New Revision: 545933
URL: http://svn.apache.org/viewvc?view=rev&rev=545933
Log:
Improve large-file support.
It looks like mod_proxy_ajp will handle requests over 2GB, so clean up the
handling on the Java side.
Modified:
tomcat/connectors/trunk/jk/java/org/apache/jk/common/HandlerRequest.java
Modified:
tomcat/connectors/trunk/jk/java/org/apache/jk/common/HandlerRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/common/HandlerRequest.java?view=diff&rev=545933&r1=545932&r2=545933
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/jk/common/HandlerRequest.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/common/HandlerRequest.java
Sun Jun 10 13:37:18 2007
@@ -407,7 +407,7 @@
// Check to see if there should be a body packet coming along
// immediately after
- int cl=req.getContentLength();
+ long cl=req.getContentLengthLong();
if(cl > 0) {
JkInputStream jkIS = ep.getInputStream();
jkIS.setIsReadRequired(true);
@@ -577,7 +577,9 @@
if (hId == AjpConstants.SC_REQ_CONTENT_LENGTH ||
(hId == -1 && tmpMB.equalsIgnoreCase("Content-Length"))) {
// just read the content-length header, so set it
- req.setContentLength( vMB.getInt() );
+ long cl = vMB.getLong();
+ if(cl < Integer.MAX_VALUE)
+ req.setContentLength( (int)cl );
} else if (hId == AjpConstants.SC_REQ_CONTENT_TYPE ||
(hId == -1 && tmpMB.equalsIgnoreCase("Content-Type"))) {
// just read the content-type header, so set it
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
