Author: billbarker
Date: Sun Jun 24 16:19:50 2007
New Revision: 550297
URL: http://svn.apache.org/viewvc?view=rev&rev=550297
Log:
porting AJP large-file support from 5.5
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?view=diff&rev=550297&r1=550296&r2=550297
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun
Jun 24 16:19:50 2007
@@ -936,9 +936,9 @@
if (contentLanguage != null) {
headers.setValue("Content-Language").setString(contentLanguage);
}
- int contentLength = response.getContentLength();
+ long contentLength = response.getContentLengthLong();
if (contentLength >= 0) {
- headers.setValue("Content-Length").setInt(contentLength);
+ headers.setValue("Content-Length").setLong(contentLength);
}
// Other headers
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?view=diff&rev=550297&r1=550296&r2=550297
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sun Jun
24 16:19:50 2007
@@ -944,9 +944,9 @@
if (contentLanguage != null) {
headers.setValue("Content-Language").setString(contentLanguage);
}
- int contentLength = response.getContentLength();
+ long contentLength = response.getContentLengthLong();
if (contentLength >= 0) {
- headers.setValue("Content-Length").setInt(contentLength);
+ headers.setValue("Content-Length").setLong(contentLength);
}
// Other headers
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java?view=diff&rev=550297&r1=550296&r2=550297
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java Sun Jun
24 16:19:50 2007
@@ -293,9 +293,9 @@
if( contentLanguage != null ) {
headers.setValue("Content-Language").setString(contentLanguage);
}
- int contentLength = res.getContentLength();
+ long contentLength = res.getContentLengthLong();
if( contentLength >= 0 ) {
- headers.setValue("Content-Length").setInt(contentLength);
+ headers.setValue("Content-Length").setLong(contentLength);
}
int numHeaders = headers.size();
outputMsg.appendInt(numHeaders);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
