From 3e8dbe640e77f172cbd75d8c1c4a240636810172 Mon Sep 17 00:00:00 2001 From: billbarker Date: Sun, 24 Jun 2007 23:19:50 +0000 Subject: [PATCH] porting AJP large-file support from 5.5 git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@550297 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AjpAprProcessor.java | 4 ++-- java/org/apache/coyote/ajp/AjpProcessor.java | 4 ++-- java/org/apache/jk/common/JkInputStream.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index 72c9d78a1..00d2ddca5 100644 --- a/java/org/apache/coyote/ajp/AjpAprProcessor.java +++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java @@ -936,9 +936,9 @@ public class AjpAprProcessor implements ActionHook { 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 diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 7f7e85330..5dfe0474d 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -944,9 +944,9 @@ public class AjpProcessor implements ActionHook { 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 diff --git a/java/org/apache/jk/common/JkInputStream.java b/java/org/apache/jk/common/JkInputStream.java index 72026052b..e2b363a74 100644 --- a/java/org/apache/jk/common/JkInputStream.java +++ b/java/org/apache/jk/common/JkInputStream.java @@ -293,9 +293,9 @@ public class JkInputStream implements InputBuffer, OutputBuffer { 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); -- 2.11.0