Author: violetagg
Date: Wed Oct 28 15:02:03 2015
New Revision: 1711026
URL: http://svn.apache.org/viewvc?rev=1711026&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58544
Switch from
request.getContentLength to request.getContentLengthLong
urlConnection.getContentLength to urlConnection.getContentLengthLong
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1711026&r1=1711025&r2=1711026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Wed Oct 28
15:02:03 2015
@@ -371,7 +371,7 @@ public final class CGIServlet extends Ht
out.println("<li><b>characterEncoding</b> = " +
req.getCharacterEncoding());
out.println("<li><b>contentLength</b> = " +
- req.getContentLength());
+ req.getContentLengthLong());
out.println("<li><b>contentType</b> = " +
req.getContentType());
Enumeration<Locale> locales = req.getLocales();
@@ -1078,9 +1078,9 @@ public final class CGIServlet extends Ht
* if there is no content, so we cannot put 0 or -1 in as per the
* Servlet API spec.
*/
- int contentLength = req.getContentLength();
+ long contentLength = req.getContentLengthLong();
String sContentLength = (contentLength <= 0 ? "" :
- Integer.toString(contentLength));
+ Long.toString(contentLength));
envp.put("CONTENT_LENGTH", sContentLength);
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1711026&r1=1711025&r2=1711026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Oct
28 15:02:03 2015
@@ -472,7 +472,7 @@ public class WebdavServlet
Node propNode = null;
- if (req.getContentLength() > 0) {
+ if (req.getContentLengthLong() > 0) {
DocumentBuilder documentBuilder = getDocumentBuilder();
try {
@@ -716,7 +716,7 @@ public class WebdavServlet
return;
}
- if (req.getContentLength() > 0) {
+ if (req.getContentLengthLong() > 0) {
DocumentBuilder documentBuilder = getDocumentBuilder();
try {
// Document document =
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=1711026&r1=1711025&r2=1711026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
Wed Oct 28 15:02:03 2015
@@ -170,9 +170,9 @@ public class SSIServletExternalResolver
}
} else if(nameParts[0].equals("CONTENT")) {
if (nameParts[1].equals("LENGTH")) {
- int contentLength = req.getContentLength();
+ long contentLength = req.getContentLengthLong();
if (contentLength >= 0) {
- retVal = Integer.toString(contentLength);
+ retVal = Long.toString(contentLength);
}
} else if (nameParts[1].equals("TYPE")) {
retVal = req.getContentType();
@@ -504,7 +504,7 @@ public class SSIServletExternalResolver
long fileSize = -1;
try {
URLConnection urlConnection = getURLConnection(path, virtual);
- fileSize = urlConnection.getContentLength();
+ fileSize = urlConnection.getContentLengthLong();
} catch (IOException e) {
// Ignore this. It will always fail for non-file based includes
}
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=1711026&r1=1711025&r2=1711026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
Wed Oct 28 15:02:03 2015
@@ -813,7 +813,7 @@ public class ExtendedAccessLogValve exte
@Override
public void addElement(CharArrayWriter buf, Date date,
Request request, Response response, long time) {
- buf.append(wrap("" + request.getContentLength()));
+ buf.append(wrap("" + request.getContentLengthLong()));
}
};
} else if ("characterEncoding".equals(parameter)) {
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1711026&r1=1711025&r2=1711026&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Wed Oct
28 15:02:03 2015
@@ -494,7 +494,7 @@ public abstract class TomcatBaseTest ext
out.println("REQUEST-CHARACTER-ENCODING: " +
request.getCharacterEncoding());
out.println("REQUEST-CONTENT-LENGTH: " +
- request.getContentLength());
+ request.getContentLengthLong());
out.println("REQUEST-CONTENT-TYPE: " + request.getContentType());
out.println("REQUEST-LOCALE: " + request.getLocale());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
