svn commit: r1354847 - in /tomcat/trunk: java/javax/servlet/http/HttpServlet.java test/javax/servlet/http/ test/javax/servlet/http/TestHttpServlet.java test/org/apache/catalina/startup/TomcatBaseTest.
Author: markt
Date: Thu Jun 28 07:55:13 2012
New Revision: 1354847
URL: http://svn.apache.org/viewvc?rev=1354847&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53454
Return correct content-length header for HEAD requests when value is > 2GB
Added:
tomcat/trunk/test/javax/servlet/http/
tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java (with props)
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1354847&r1=1354846&r2=1354847&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Thu Jun 28 07:55:13
2012
@@ -758,6 +758,14 @@ class NoBodyResponse extends HttpServlet
}
@Override
+public void setHeader(String name, String value) {
+super.setHeader(name, value);
+if ("content-length".equalsIgnoreCase(name)) {
+didSetContentLength = true;
+}
+}
+
+@Override
public ServletOutputStream getOutputStream() throws IOException {
return noBody;
}
Added: tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java?rev=1354847&view=auto
==
--- tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java (added)
+++ tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java Thu Jun 28
07:55:13 2012
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.servlet.http;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestHttpServlet extends TomcatBaseTest {
+
+@Test
+public void testBug53454() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+StandardContext ctx = (StandardContext)
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
+
+// Map the test Servlet
+LargeBodyServlet largeBodyServlet = new LargeBodyServlet();
+Tomcat.addServlet(ctx, "largeBodyServlet", largeBodyServlet);
+ctx.addServletMapping("/", "largeBodyServlet");
+
+tomcat.start();
+
+Map> resHeaders=
+new HashMap>();
+int rc = headUrl("http://localhost:"; + getPort() + "/", new
ByteChunk(),
+ resHeaders);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertEquals(LargeBodyServlet.RESPONSE_LENGTH,
+resHeaders.get("Content-Length").get(0));
+}
+
+
+private static class LargeBodyServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+private static final String RESPONSE_LENGTH = "12345678901";
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.setHeader("content-length", RESPONSE_LENGTH);
+}
+}
+}
Propchange: tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java
--
svn:eol-style = native
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=1354847&r1=1354846&r2=1354847&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBase
Re: svn commit: r1354847 - in /tomcat/trunk: java/javax/servlet/http/HttpServlet.java test/javax/servlet/http/ test/javax/servlet/http/TestHttpServlet.java test/org/apache/catalina/startup/TomcatBaseT
2012/6/28 :
> Author: markt
> Date: Thu Jun 28 07:55:13 2012
> New Revision: 1354847
>
> URL: http://svn.apache.org/viewvc?rev=1354847&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53454
> Return correct content-length header for HEAD requests when value is > 2GB
>
> Added:
> tomcat/trunk/test/javax/servlet/http/
> tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java (with props)
> Modified:
> tomcat/trunk/java/javax/servlet/http/HttpServlet.java
> tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
1. Maybe use response.getHeader() method added in Servlet 3.0?
There is setIntHeader() method and add*Header methods.
2. Trunk needs an additional fix for Servlet 3.1,
as there will be setContentLengthLong() method as was recently added to trunk.
>
> Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1354847&r1=1354846&r2=1354847&view=diff
> ==
> --- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
> +++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Thu Jun 28 07:55:13
> 2012
> @@ -758,6 +758,14 @@ class NoBodyResponse extends HttpServlet
> }
>
> @Override
> + public void setHeader(String name, String value) {
> + super.setHeader(name, value);
> + if ("content-length".equalsIgnoreCase(name)) {
> + didSetContentLength = true;
> + }
> + }
> +
> + @Override
> public ServletOutputStream getOutputStream() throws IOException {
> return noBody;
> }
>(...)
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1354847 - in /tomcat/trunk: java/javax/servlet/http/HttpServlet.java test/javax/servlet/http/ test/javax/servlet/http/TestHttpServlet.java test/org/apache/catalina/startup/TomcatBaseT
On 28/06/2012 09:06, Konstantin Kolinko wrote: > 2012/6/28 : >> Author: markt >> Date: Thu Jun 28 07:55:13 2012 >> New Revision: 1354847 >> >> URL: http://svn.apache.org/viewvc?rev=1354847&view=rev >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53454 >> Return correct content-length header for HEAD requests when value is > 2GB >> >> Added: >>tomcat/trunk/test/javax/servlet/http/ >>tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java (with props) >> Modified: >>tomcat/trunk/java/javax/servlet/http/HttpServlet.java >>tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java > > > 1. Maybe use response.getHeader() method added in Servlet 3.0? Because of the way we handle content-length, I don't think that will work. > There is setIntHeader() method and add*Header methods. Yep. I'll add some more checks. > 2. Trunk needs an additional fix for Servlet 3.1, > as there will be setContentLengthLong() method as was recently added to trunk. This was intended for back-port. There are a number of changes needed to trunk for setContentLengthLong() that I am currently working on. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1354855 - in /tomcat/trunk/java: javax/servlet/ javax/servlet/http/ org/apache/catalina/core/ org/apache/catalina/servlets/
Author: markt
Date: Thu Jun 28 08:23:12 2012
New Revision: 1354855
URL: http://svn.apache.org/viewvc?rev=1354855&view=rev
Log:
Servlet 3.1 - setContentLengthLong
Modified:
tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java?rev=1354855&r1=1354854&r2=1354855&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java Thu Jun 28
08:23:12 2012
@@ -115,7 +115,8 @@ public class ServletResponseWrapper impl
}
/**
- * TODO SERVLET 3.1
+ * The default behavior of this method is to call setContentLength(long
len)
+ * on the wrapped response object.
*/
@Override
public void setContentLengthLong(long length) {
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1354855&r1=1354854&r2=1354855&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Thu Jun 28 08:23:12
2012
@@ -758,6 +758,12 @@ class NoBodyResponse extends HttpServlet
}
@Override
+public void setContentLengthLong(long len) {
+super.setContentLengthLong(len);
+didSetContentLength = true;
+}
+
+@Override
public void setHeader(String name, String value) {
super.setHeader(name, value);
if ("content-length".equalsIgnoreCase(name)) {
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1354855&r1=1354854&r2=1354855&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Thu
Jun 28 08:23:12 2012
@@ -89,7 +89,8 @@ class ApplicationHttpResponse extends Ht
/**
- * Disallow setContentLength() calls on an included response.
+ * Disallow setContentLength(int) calls on an included
+ * response.
*
* @param len The new content length
*/
@@ -103,6 +104,21 @@ class ApplicationHttpResponse extends Ht
/**
+ * Disallow setContentLengthLong(long) calls on an included
+ * response.
+ *
+ * @param len The new content length
+ */
+@Override
+public void setContentLengthLong(long len) {
+
+if (!included)
+getResponse().setContentLengthLong(len);
+
+}
+
+
+/**
* Disallow setContentType() calls on an included response.
*
* @param type The new content type
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=1354855&r1=1354854&r2=1354855&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java Thu Jun
28 08:23:12 2012
@@ -87,7 +87,8 @@ class ApplicationResponse extends Servle
/**
- * Disallow setContentLength() calls on an included response.
+ * Disallow setContentLength(int) calls on an included
+ * response.
*
* @param len The new content length
*/
@@ -101,6 +102,21 @@ class ApplicationResponse extends Servle
/**
+ * Disallow setContentLengthLong(long) calls on an included
+ * response.
+ *
+ * @param len The new content length
+ */
+@Override
+public void setContentLengthLong(long len) {
+
+if (!included)
+getResponse().setContentLengthLong(len);
+
+}
+
+
+/**
* Disallow setContentType() calls on an included response.
*
* @param type The new content type
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1354855&r1=1354854&r2=1354855&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServle
svn commit: r1354856 - /tomcat/trunk/java/javax/servlet/http/HttpServlet.java
Author: markt
Date: Thu Jun 28 08:26:50 2012
New Revision: 1354856
URL: http://svn.apache.org/viewvc?rev=1354856&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53454
Additional ways content length may be set
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1354856&r1=1354855&r2=1354856&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Thu Jun 28 08:26:50
2012
@@ -766,6 +766,28 @@ class NoBodyResponse extends HttpServlet
@Override
public void setHeader(String name, String value) {
super.setHeader(name, value);
+checkHeader(name);
+}
+
+@Override
+public void addHeader(String name, String value) {
+super.addHeader(name, value);
+checkHeader(name);
+}
+
+@Override
+public void setIntHeader(String name, int value) {
+super.setIntHeader(name, value);
+checkHeader(name);
+}
+
+@Override
+public void addIntHeader(String name, int value) {
+super.addIntHeader(name, value);
+checkHeader(name);
+}
+
+private void checkHeader(String name) {
if ("content-length".equalsIgnoreCase(name)) {
didSetContentLength = true;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1354862 - in /tomcat/trunk/java/javax/servlet: ReadListener.java WriteListener.java http/ProtocolHandler.java http/WebConnection.java
Author: kkolinko
Date: Thu Jun 28 08:52:38 2012
New Revision: 1354862
URL: http://svn.apache.org/viewvc?rev=1354862&view=rev
Log:
Remove fhanik's @author tags from new files added in r1354166. We should not
use @author.
Modified:
tomcat/trunk/java/javax/servlet/ReadListener.java
tomcat/trunk/java/javax/servlet/WriteListener.java
tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java
tomcat/trunk/java/javax/servlet/http/WebConnection.java
Modified: tomcat/trunk/java/javax/servlet/ReadListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ReadListener.java?rev=1354862&r1=1354861&r2=1354862&view=diff
==
--- tomcat/trunk/java/javax/servlet/ReadListener.java (original)
+++ tomcat/trunk/java/javax/servlet/ReadListener.java Thu Jun 28 08:52:38 2012
@@ -17,7 +17,6 @@
package javax.servlet;
/**
* TODO SERVLET 3.1
- * @author filip
*
*/
public interface ReadListener extends java.util.EventListener{
Modified: tomcat/trunk/java/javax/servlet/WriteListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/WriteListener.java?rev=1354862&r1=1354861&r2=1354862&view=diff
==
--- tomcat/trunk/java/javax/servlet/WriteListener.java (original)
+++ tomcat/trunk/java/javax/servlet/WriteListener.java Thu Jun 28 08:52:38 2012
@@ -18,7 +18,6 @@ package javax.servlet;
/**
* TODO SERVLET 3.1
- * @author filip
*
*/
public interface WriteListener extends java.util.EventListener{
Modified: tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java?rev=1354862&r1=1354861&r2=1354862&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java (original)
+++ tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java Thu Jun 28
08:52:38 2012
@@ -17,7 +17,6 @@
package javax.servlet.http;
/**
* TODO SERVLET 3.1
- * @author filip
*
*/
public interface ProtocolHandler {
Modified: tomcat/trunk/java/javax/servlet/http/WebConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/WebConnection.java?rev=1354862&r1=1354861&r2=1354862&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/WebConnection.java (original)
+++ tomcat/trunk/java/javax/servlet/http/WebConnection.java Thu Jun 28 08:52:38
2012
@@ -22,7 +22,6 @@ import javax.servlet.ServletInputStream;
import javax.servlet.ServletOutputStream;
/**
* TODO SERVLET 3.1
- * @author filip
*
*/
public interface WebConnection {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1354866 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/http/HttpServlet.java test/javax/servlet/http/ test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jun 28 08:57:31 2012
New Revision: 1354866
URL: http://svn.apache.org/viewvc?rev=1354866&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53454
Return correct content-length header for HEAD requests when value is > 2GB
Added:
tomcat/tc7.0.x/trunk/test/javax/servlet/http/
- copied from r1354847, tomcat/trunk/test/javax/servlet/http/
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1354847,1354856
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java?rev=1354866&r1=1354865&r2=1354866&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java Thu Jun 28
08:57:31 2012
@@ -758,6 +758,36 @@ class NoBodyResponse extends HttpServlet
}
@Override
+public void setHeader(String name, String value) {
+super.setHeader(name, value);
+checkHeader(name);
+}
+
+@Override
+public void addHeader(String name, String value) {
+super.addHeader(name, value);
+checkHeader(name);
+}
+
+@Override
+public void setIntHeader(String name, int value) {
+super.setIntHeader(name, value);
+checkHeader(name);
+}
+
+@Override
+public void addIntHeader(String name, int value) {
+super.addIntHeader(name, value);
+checkHeader(name);
+}
+
+private void checkHeader(String name) {
+if ("content-length".equalsIgnoreCase(name)) {
+didSetContentLength = true;
+}
+}
+
+@Override
public ServletOutputStream getOutputStream() throws IOException {
return noBody;
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1354866&r1=1354865&r2=1354866&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Thu Jun 28 08:57:31 2012
@@ -200,6 +200,11 @@ public abstract class TomcatBaseTest ext
return getUrl(path, out, null, resHead);
}
+public static int headUrl(String path, ByteChunk out,
+Map> resHead) throws IOException {
+return methodUrl(path, out, 100, null, resHead, "HEAD");
+}
+
public static int getUrl(String path, ByteChunk out,
Map> reqHead,
Map> resHead) throws IOException {
@@ -209,12 +214,20 @@ public abstract class TomcatBaseTest ext
public static int getUrl(String path, ByteChunk out, int readTimeout,
Map> reqHead,
Map> resHead) throws IOException {
+return methodUrl(path, out, readTimeout, reqHead, resHead, "GET");
+}
+
+public static int methodUrl(String path, ByteChunk out, int readTimeout,
+Map> reqHead,
+Map> resHead,
+String method) throws IOException {
URL url = new URL(path);
HttpURLConnection connection =
(HttpURLConnection) url.openConnection();
connection.setUseCaches(false);
connection.setReadTimeout(readTimeout);
+connection.setRequestMethod(method);
if (reqHead != null) {
for (Map.Entry> entry : reqHead.entrySet()) {
StringBuilder valueList = new StringBuilder();
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1354866&r1=1354865&r2=1354866&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 28 08:57:31 2012
@@ -180,6 +180,10 @@
implementations used with JMX to jmxaccessor.tasks file.
(kkolinko)
+
+53454: Return correct content-length header for HEAD
requests
+when content length is greater than 2GB. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53454] Default doHead implementation overrides 'Content-Length' header
https://issues.apache.org/bugzilla/show_bug.cgi?id=53454 --- Comment #5 from Mark Thomas --- Fixed in trunk and 7.0.x and will be included in 7.0.29 onwards. Proposed for 6.0.x. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1354868 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jun 28 08:59:54 2012 New Revision: 1354868 URL: http://svn.apache.org/viewvc?rev=1354868&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1354868&r1=1354867&r2=1354868&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 28 08:59:54 2012 @@ -204,6 +204,13 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53454 + Return correct content-length header for HEAD requests when value is > 2GB + http://svn.apache.org/viewvc?rev=1354866&view=rev + +1: markt + -1: + + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1354871 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jun 28 09:04:23 2012 New Revision: 1354871 URL: http://svn.apache.org/viewvc?rev=1354871&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1354871&r1=1354870&r2=1354871&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 28 09:04:23 2012 @@ -207,7 +207,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53454 Return correct content-length header for HEAD requests when value is > 2GB http://svn.apache.org/viewvc?rev=1354866&view=rev - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1354892 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Jun 28 10:01:04 2012 New Revision: 1354892 URL: http://svn.apache.org/viewvc?rev=1354892&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1354892&r1=1354891&r2=1354892&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 28 10:01:04 2012 @@ -72,7 +72,7 @@ PATCHES PROPOSED TO BACKPORT: Additional patch: http://svn.apache.org/viewvc?rev=1304468&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * https://issues.apache.org/bugzilla/show_bug.cgi?id=52811 @@ -163,13 +163,13 @@ PATCHES PROPOSED TO BACKPORT: Use the message from the Throwable for the error report if none was specified via sendError() http://people.apache.org/~markt/patches/2012-06-11-bug53071-tc6.patch - +1: markt + +1: markt, kfujino -1: * Improve InternalNioInputBuffer.parseHeaders() http://svn.apache.org/viewvc?view=revision&revision=1350294 (r1350301 in Tomcat 7) - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Implement maxHeaderCount attribute on Connector. @@ -183,7 +183,7 @@ PATCHES PROPOSED TO BACKPORT: Eol-Style: svn propset svn:eol-style native java/org/apache/coyote/AbstractProtocol.java svn propset svn:eol-style native java/org/apache/tomcat/util/net/AbstractEndpoint.java - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50306 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53481] New: Support SSL_OP_CIPHER_SERVER_PREFERENCE / SSLHonorCipherOrder
https://issues.apache.org/bugzilla/show_bug.cgi?id=53481 Priority: P2 Bug ID: 53481 Assignee: dev@tomcat.apache.org Summary: Support SSL_OP_CIPHER_SERVER_PREFERENCE / SSLHonorCipherOrder Severity: normal Classification: Unclassified OS: All Reporter: m...@normi.net Hardware: All Status: NEW Version: 1.1.24 Component: Library Product: Tomcat Native Currently, Tomcat Native does not have an equivalent of the mod_ssl SSLHonorCipherOrder directive and is thus vulnerable to the SSL BEAST attack. See http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder for the docs on this directive, and https://community.qualys.com/blogs/securitylabs/2011/10/17/mitigating-the-beast-attack-on-tls on why and how it mitigates the BEAST attack. Please incorporate an option named SSLHonorCipherOrder that sets the OpenSSL option SSL_OP_CIPHER_SERVER_PREFERENCE P.S., not sure whether to qualify this as bug or enhancement, but since it concerns a security issue I filed it as a bug. P.S.2, I'm willing to create a patch myself, but since I don't have an Tomcat Native build env that will probably take some time... It's a really small change. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1355042 - in /tomcat/trunk/java: javax/servlet/ServletInputStream.java org/apache/catalina/connector/CoyoteInputStream.java
Author: fhanik
Date: Thu Jun 28 15:22:48 2012
New Revision: 1355042
URL: http://svn.apache.org/viewvc?rev=1355042&view=rev
Log:
Add another method found in spec
Modified:
tomcat/trunk/java/javax/servlet/ServletInputStream.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
Modified: tomcat/trunk/java/javax/servlet/ServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletInputStream.java?rev=1355042&r1=1355041&r2=1355042&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletInputStream.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletInputStream.java Thu Jun 28 15:22:48
2012
@@ -86,6 +86,13 @@ public abstract class ServletInputStream
* TODO SERVLET 3.1
* @return
*/
+public abstract int dataAvailable();
+
+
+/**
+ * TODO SERVLET 3.1
+ * @return
+ */
public abstract boolean isFinished();
/**
* TODO SERVLET 3.1
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java?rev=1355042&r1=1355041&r2=1355042&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java Thu
Jun 28 15:22:48 2012
@@ -251,14 +251,16 @@ public class CoyoteInputStream
return false;
}
+@Override
+public int dataAvailable() {
+// TODO Auto-generated method stub
+return 0;
+}
+
-/**
- * TODO SERVLET 3.1
- */
@Override
public boolean isReady() {
-// TODO Auto-generated method stub
-return false;
+return dataAvailable()>0;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
non blocking API
I posted some feedback to the expert group: http://java.net/projects/servlet-spec/lists/users/archive/2012-06/message/15 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
