Re: Time for Tomcat 7.0.63?
Hi, 2015-06-23 20:53 GMT+03:00 Christopher Schultz ch...@christopherschultz.net : All, Some recent bugs have been fixed and there is some community demand for 7.0.63. e.g. https://bz.apache.org/bugzilla/show_bug.cgi?id=57783 Violetta, are you up for another release? I want to fix this one https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 Also I want to check this one https://bz.apache.org/bugzilla/show_bug.cgi?id=58063 So my plans are to start with Tomcat 7.0.63 preparation in 2-3 days. Regards, Violeta -chris
svn commit: r1687193 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_4.java
Author: markt
Date: Wed Jun 24 08:02:34 2015
New Revision: 1687193
URL: http://svn.apache.org/r1687193
Log:
Add unit tests for rst frames
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_4.java (with
props)
Added: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_4.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_4.java?rev=1687193view=auto
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_4.java (added)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_4.java Wed Jun
24 08:02:34 2015
@@ -0,0 +1,87 @@
+/*
+ * 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 org.apache.coyote.http2;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Unit tests for Section 6.4 of
+ * a href=https://tools.ietf.org/html/rfc7540;RFC 7540/a.
+ * br
+ * The order of tests in this class is aligned with the order of the
+ * requirements in the RFC.
+ */
+public class TestHttp2Section_6_4 extends Http2TestBase {
+
+@Test
+public void testResetFrameOnStreamZero() throws Exception {
+// HTTP2 upgrade
+http2Connect();
+
+sendRst(0, Http2Error.NO_ERROR.getCode());
+
+// Go away
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+0-Goaway-[1]-[ + Http2Error.PROTOCOL_ERROR.getCode() +
]-[));
+}
+
+
+@Test
+public void testResetFrameOnIdleStream() throws Exception {
+// HTTP2 upgrade
+http2Connect();
+
+sendPriority(3, 0, 15);
+sendRst(3, Http2Error.NO_ERROR.getCode());
+
+// Go away
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+0-Goaway-[1]-[ + Http2Error.PROTOCOL_ERROR.getCode() +
]-[));
+}
+
+
+@Test
+public void testResetFrameWrongLength() throws Exception {
+// HTTP2 upgrade
+http2Connect();
+
+byte[] resetFrame = new byte[10];
+// length
+ByteUtil.setThreeBytes(resetFrame, 0, 1);
+// type
+resetFrame[3] = FrameType.RST.getIdByte();
+// No flags
+// Stream ID
+ByteUtil.set31Bits(resetFrame, 5, 3);
+
+// Payload - left as zero
+
+os.write(resetFrame);
+os.flush();
+
+// Read GOAWAY frame
+parser.readFrame(true);
+
+Assert.assertEquals(3-RST-[ + Http2Error.FRAME_SIZE_ERROR.getCode()
+ ],
+output.getTrace());
+}
+}
Propchange: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_4.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58074] New: Memory leak - session serialization
https://bz.apache.org/bugzilla/show_bug.cgi?id=58074
Bug ID: 58074
Summary: Memory leak - session serialization
Product: Tomcat 7
Version: 7.0.62
Hardware: PC
Status: NEW
Severity: minor
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: qed...@gmail.com
Created attachment 32853
-- https://bz.apache.org/bugzilla/attachment.cgi?id=32853action=edit
SSCCE
Scenario: I have enabled session serialization on
stop+start/reload/undeploy+deploy for my ROOT.war by adding Manager
pathname=${catalina.base}/ROOT-sessions.ser / into
/webapp/META-INF/context.xml in my application. My sessions for my app are
de/serialized properly. But when my custom object implementing Serializable is
stored in some session, then after stop, reload or undeploy and Find leaks in
manager console I get a message: The following web applications were stopped
(reloaded, undeployed), but their classes from previous runs are still loaded
in memory, thus causing a memory leak (use a profiler to confirm): /. With
non-serializable objects in session there is no problem (of course, I have to
have disabled distributable /). According to mailing list, this is not a bug,
but I don't believe it: http://bit.ly/1HbBzrJ . Currently it seems that I have
only one option: to restart a service after undeploy to prevent memory leaks.
I'd like to work without service restarting, if it is possible. My application
has distributable / in web.xml. I'm using latest Tomcat 7 + latest JDK 7 +
Win 7 Pro 64. I don't know if bug persists in Tomcat 8. The serializable object
is very simple (see attached SSCCE):
public class SessionUser implements Serializable {
public SessionUser() {}
public String toString() { return xx; }
}.
The question is: Is it possible to have session serialization enabled (and have
serializable objects in session) and do redeploy without service restart while
no memory leaks happens?
--
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
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1446 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1687184 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687184 - in /tomcat/trunk/test/org/apache/coyote/http2: Http2TestBase.java TestHttp2Section_6_2.java
Author: markt
Date: Wed Jun 24 07:53:55 2015
New Revision: 1687184
URL: http://svn.apache.org/r1687184
Log:
Use constants
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_2.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1687184r1=1687183r2=1687184view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Wed Jun 24
07:53:55 2015
@@ -158,8 +158,7 @@ public abstract class Http2TestBase exte
headersPayload.flip();
ByteUtil.setThreeBytes(frameHeader, 0, headersPayload.limit());
-// Header frame is type 0x01
-frameHeader[3] = 0x01;
+frameHeader[3] = FrameType.HEADERS.getIdByte();
// Flags. end of headers (0x04). end of stream (0x01)
frameHeader[4] = 0x05;
if (padding != null) {
@@ -180,8 +179,7 @@ public abstract class Http2TestBase exte
headersPayload.flip();
ByteUtil.setThreeBytes(frameHeader, 0, headersPayload.limit());
-// Header frame is type 0x01
-frameHeader[3] = 0x01;
+frameHeader[3] = FrameType.HEADERS.getIdByte();
// Flags. end of stream (0x01)
frameHeader[4] = 0x01;
// Stream id
@@ -198,8 +196,7 @@ public abstract class Http2TestBase exte
headersPayload.flip();
ByteUtil.setThreeBytes(frameHeader, 0, headersPayload.limit());
-// Continuation frame is type 0x09
-frameHeader[3] = 0x09;
+frameHeader[3] = FrameType.CONTINUATION.getIdByte();
// Flags. end of headers (0x04)
frameHeader[4] = 0x04;
// Stream id
@@ -231,8 +228,7 @@ public abstract class Http2TestBase exte
headersPayload.flip();
ByteUtil.setThreeBytes(headersFrameHeader, 0, headersPayload.limit());
-// Header frame is type 0x01
-headersFrameHeader[3] = 0x01;
+headersFrameHeader[3] = FrameType.HEADERS.getIdByte();
// Flags. end of headers (0x04)
headersFrameHeader[4] = 0x04;
// Stream id
@@ -479,8 +475,7 @@ public abstract class Http2TestBase exte
byte[] rstFrame = new byte[13];
// length is always 4
rstFrame[2] = 0x04;
-// type is always 3
-rstFrame[3] = 0x03;
+rstFrame[3] = FrameType.RST.getIdByte();
// no flags
// Stream ID
ByteUtil.set31Bits(rstFrame, 5, streamId);
@@ -502,8 +497,7 @@ public abstract class Http2TestBase exte
byte[] updateFrame = new byte[13];
// length is always 4
updateFrame[2] = 0x04;
-// type is always 8
-updateFrame[3] = 0x08;
+updateFrame[3] = FrameType.WINDOW_UPDATE.getIdByte();
// no flags
// Stream ID
ByteUtil.set31Bits(updateFrame, 5, streamId);
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_2.java?rev=1687184r1=1687183r2=1687184view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_2.java Wed Jun
24 07:53:55 2015
@@ -87,8 +87,7 @@ public class TestHttp2Section_6_2 extend
// Header
// length
ByteUtil.setThreeBytes(headerFrame, 0, 1);
-// type 1 (headers)
-headerFrame[3] = 0x01;
+headerFrame[3] = FrameType.HEADERS.getIdByte();
// flags 8 (padded)
headerFrame[4] = 0x08;
// stream 3
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687183 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_3.java
Author: markt
Date: Wed Jun 24 07:53:20 2015
New Revision: 1687183
URL: http://svn.apache.org/r1687183
Log:
Add unit tests for priority frames
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_3.java (with
props)
Added: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_3.java?rev=1687183view=auto
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_3.java (added)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_3.java Wed Jun
24 07:53:20 2015
@@ -0,0 +1,94 @@
+/*
+ * 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 org.apache.coyote.http2;
+
+import java.nio.ByteBuffer;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Unit tests for Section 6.3 of
+ * a href=https://tools.ietf.org/html/rfc7540;RFC 7540/a.
+ * br
+ * The order of tests in this class is aligned with the order of the
+ * requirements in the RFC.
+ */
+public class TestHttp2Section_6_3 extends Http2TestBase {
+
+@Test
+public void testPriorityFrameOnStreamZero() throws Exception {
+// HTTP2 upgrade
+http2Connect();
+
+sendPriority(0, 1, 15);
+
+// Go away
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+0-Goaway-[1]-[ + Http2Error.PROTOCOL_ERROR.getCode() +
]-[));
+}
+
+
+@Test
+public void testPriorityFrameBetweenHeaderFrames() throws Exception {
+// HTTP2 upgrade
+http2Connect();
+
+// Part 1
+byte[] frameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+buildSimpleGetRequestPart1(frameHeader, headersPayload, 3);
+writeFrame(frameHeader, headersPayload);
+
+sendPriority(5, 3, 15);
+
+// Read GOAWAY frame
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+0-Goaway-[1]-[ + Http2Error.COMPRESSION_ERROR.getCode() +
]-[));
+}
+
+
+@Test
+public void testPriorityFrameWrongLength() throws Exception {
+// HTTP2 upgrade
+http2Connect();
+
+byte[] priorityFrame = new byte[10];
+// length
+ByteUtil.setThreeBytes(priorityFrame, 0, 1);
+// type
+priorityFrame[3] = FrameType.PRIORITY.getIdByte();
+// No flags
+// Stream ID
+ByteUtil.set31Bits(priorityFrame, 5, 3);
+
+// Payload - left as zero
+
+os.write(priorityFrame);
+os.flush();
+
+// Read GOAWAY frame
+parser.readFrame(true);
+
+Assert.assertEquals(3-RST-[ + Http2Error.FRAME_SIZE_ERROR.getCode()
+ ],
+output.getTrace());
+}
+}
Propchange: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_3.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57700] Exception in a LifecycleListener on Context makes webapp unreachable in spite of subsequent successful startups
https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 --- Comment #4 from Violeta Georgieva violet...@apache.org --- Hi, I succeeded to reproduce the scenario on all Tomcat versions. The issue is the following: - The implementation of Manager web app invokes HostConfig to deploy the web application. ... at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:186) at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:726) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:700) at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:718) at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:941) ... - In ContainerBase.addChildInternal if the child's start fails then the event ADD_CHILD_EVENT is not sent. - MapperListener will not be added to the context's listeners because it will not receive the event ADD_CHILD_EVENT - Later on when one tries to start the context again MapperListener will not be notified. The test testWebappListenerConfigureFail() is successfull because it explicitly sets ((ContainerBase) tomcat.getHost()).setStartChildren(false); with this flag when ContainerBase.addChildInternal is invoked, the child's start will be skipped and the event ADD_CHILD_EVENT will be sent. What do you think if we move the notification for event ADD_CHILD_EVENT before children start? (see below) Regards, Violeta Index: ContainerBase.java === --- ContainerBase.java(revision 1686237) +++ ContainerBase.java(working copy) @@ -714,6 +714,8 @@ children.put(child.getName(), child); } +fireContainerEvent(ADD_CHILD_EVENT, child); + // Start child // Don't do this inside sync block - start can be a slow process and // locking the children object can cause problems elsewhere @@ -728,8 +730,6 @@ (ContainerBase.addChild: start: + e); } } - -fireContainerEvent(ADD_CHILD_EVENT, child); } -- 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: r1687251 - /tomcat/tc8.0.x/trunk/webapps/docs/rewrite.xml
Author: remm Date: Wed Jun 24 12:34:07 2015 New Revision: 1687251 URL: http://svn.apache.org/r1687251 Log: Port 58052: Clarify that some newer additions from the mod_rewrite documentation are not supported in Tomcat. Modified: tomcat/tc8.0.x/trunk/webapps/docs/rewrite.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/rewrite.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/rewrite.xml?rev=1687251r1=1687250r2=1687251view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/rewrite.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/rewrite.xml Wed Jun 24 12:34:07 2015 @@ -528,6 +528,10 @@ cannot use code$N/code in the substi in conjunction with the strongC/strong (chain) flag, in order to apply more than one pattern before substitution occurs./p + pUnlike newer mod_rewrite versions, the Tomcat rewrite valve does + not automatically support absolute URLs (the specific redirect flag + must be used to be able to specify an absolute URLs, see below) + or direct file serving./p pAdditionally you can set special span id=rewriteflagsflags/span for emSubstitution/em by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687250 - /tomcat/trunk/webapps/docs/rewrite.xml
Author: remm Date: Wed Jun 24 12:33:24 2015 New Revision: 1687250 URL: http://svn.apache.org/r1687250 Log: 58052: Clarify that some newer additions from the mod_rewrite documentation are not supported in Tomcat. Modified: tomcat/trunk/webapps/docs/rewrite.xml Modified: tomcat/trunk/webapps/docs/rewrite.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/rewrite.xml?rev=1687250r1=1687249r2=1687250view=diff == --- tomcat/trunk/webapps/docs/rewrite.xml (original) +++ tomcat/trunk/webapps/docs/rewrite.xml Wed Jun 24 12:33:24 2015 @@ -528,6 +528,10 @@ cannot use code$N/code in the substi in conjunction with the strongC/strong (chain) flag, in order to apply more than one pattern before substitution occurs./p + pUnlike newer mod_rewrite versions, the Tomcat rewrite valve does + not automatically support absolute URLs (the specific redirect flag + must be used to be able to specify an absolute URLs, see below) + or direct file serving./p pAdditionally you can set special span id=rewriteflagsflags/span for emSubstitution/em by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1448 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1687242 Blamelist: markt BUILD FAILED: exception svn upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58074] Memory leak - session serialization
https://bz.apache.org/bugzilla/show_bug.cgi?id=58074 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- A profiler confirms that there is no memory leak here. weak references != memory leaks. GC will clear them as/if necessary to relieve memory pressure. -- 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
[Bug 57700] Exception in a LifecycleListener on Context makes webapp unreachable in spite of subsequent successful startups
https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 --- Comment #5 from Mark Thomas ma...@apache.org --- I'm wary of changing the order since it might break something else. How about a finally block? -- 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
[Bug 57700] Exception in a LifecycleListener on Context makes webapp unreachable in spite of subsequent successful startups
https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 --- Comment #8 from Remy Maucherat r...@apache.org --- Would be fine then, but +1 for the finally. -- 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: r1687242 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java
Author: markt
Date: Wed Jun 24 11:58:57 2015
New Revision: 1687242
URL: http://svn.apache.org/r1687242
Log:
Differentiate between failure modes. Handling is currently identical but it
won't be once BZ 58031 is addressed.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1687242r1=1687241r2=1687242view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Jun 24
11:58:57 2015
@@ -3046,8 +3046,17 @@ public class Request
byte[] formData = null;
try {
formData = readChunkedPostBody();
+} catch (IllegalStateException ise) {
+// chunkedPostTooLarge error
+Context context = getContext();
+if (context != null
context.getLogger().isDebugEnabled()) {
+context.getLogger().debug(
+sm.getString(coyoteRequest.parseParameters),
+ise);
+}
+return;
} catch (IOException e) {
-// Client disconnect or chunkedPostTooLarge error
+// Client disconnect
Context context = getContext();
if (context != null
context.getLogger().isDebugEnabled()) {
context.getLogger().debug(
@@ -3104,7 +3113,7 @@ public class Request
(body.getLength() + len) connector.getMaxPostSize()) {
// Too much data
checkSwallowInput();
-throw new IOException(
+throw new IllegalStateException(
sm.getString(coyoteRequest.chunkedPostTooLarge));
}
if (len 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58052] RewriteValve: Implement additional RewriteRule directive capabilities
https://bz.apache.org/bugzilla/show_bug.cgi?id=58052 --- Comment #5 from Remy Maucherat r...@apache.org --- I have documented explicitly the difference with the current mod_rewrite in that area. -- 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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1449 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1687250 Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57700] Exception in a LifecycleListener on Context makes webapp unreachable in spite of subsequent successful startups
https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 --- Comment #7 from Violeta Georgieva violet...@apache.org --- (In reply to Mark Thomas from comment #5) I'm wary of changing the order since it might break something else. How about a finally block? +1 (In reply to Remy Maucherat from comment #6) I agree it will have side effects, like maybe mapping requests while the context is being deployed ? A finally seems better but even that would still change the current behavior (previously requests would never be mapped to the failed context), although maybe the right way. The implementation is such that if the application is not started then MapperListener will just be added as Container and Lifecycle Listener but a registration of the context/wrappers will not happen. (org.apache.catalina.mapper.MapperListener.containerEvent(ContainerEvent) row 148 151) -- 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
[Bug 57700] Exception in a LifecycleListener on Context makes webapp unreachable in spite of subsequent successful startups
https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 --- Comment #6 from Remy Maucherat r...@apache.org --- I agree it will have side effects, like maybe mapping requests while the context is being deployed ? A finally seems better but even that would still change the current behavior (previously requests would never be mapped to the failed context), although maybe the right way. -- 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: r1687361 - /tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
Author: markt
Date: Wed Jun 24 20:26:17 2015
New Revision: 1687361
URL: http://svn.apache.org/r1687361
Log:
Fix typo
Modified:
tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1687361r1=1687360r2=1687361view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java Wed Jun 24
20:26:17 2015
@@ -131,7 +131,7 @@ abstract class AbstractStream {
protected void decrementWindowSize(int decrement) {
// No need for overflow protection here. Decrement can never be larger
-// the Integer.MAX_VALUE and once windowSize does negative no further
+// the Integer.MAX_VALUE and once windowSize goes negative no further
// decrements are permitted
synchronized (windowSizeLock) {
windowSize -= decrement;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687369 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt
Date: Wed Jun 24 21:01:24 2015
New Revision: 1687369
URL: http://svn.apache.org/r1687369
Log:
Remove unnecessary code
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1687369r1=1687368r2=1687369view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Jun
24 21:01:24 2015
@@ -495,8 +495,6 @@ public class Http2UpgradeHandler extends
int[] value = backLogStreams.remove(stream);
if (value != null value[1] 0) {
result = value[1];
-value[0] = 0;
-value[1] = 1;
} else {
value = new int[] { toWrite, 0 };
backLogStreams.put(stream, value);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1450 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1687261 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687278 - in /tomcat/trunk/test/org/apache/coyote/http2: Http2TestBase.java TestHttp2Section_5_2.java TestHttp2Section_5_3.java TestHttp2Section_5_5.java
Author: markt
Date: Wed Jun 24 13:55:44 2015
New Revision: 1687278
URL: http://svn.apache.org/r1687278
Log:
Make writing the settings frame unit tests easier.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_2.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_5.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1687278r1=1687277r2=1687278view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Wed Jun 24
13:55:44 2015
@@ -543,18 +543,35 @@ public abstract class Http2TestBase exte
}
-void sendSetting(int settingId, long value) throws IOException {
+void sendSettings(int streamId, boolean ack, Setting... settings) throws
IOException {
byte[] settingFrame = new byte[15];
// length
-ByteUtil.setThreeBytes(settingFrame, 0, 6);
+
+int settingsCount;
+if (settings == null) {
+settingsCount = 0;
+} else {
+settingsCount = settings.length;
+}
+
+ByteUtil.setThreeBytes(settingFrame, 0, 6 * settingsCount);
// type
settingFrame[3] = FrameType.SETTINGS.getIdByte();
-// No flags
-// Stream 0
+
+if (ack) {
+settingFrame[4] = 0x01;
+}
+
+// Stream
+ByteUtil.set31Bits(settingFrame, 5, streamId);
// Payload
-ByteUtil.setTwoBytes(settingFrame, 9, settingId);
-ByteUtil.setFourBytes(settingFrame, 11, value);
+for (int i = 0; i settingsCount; i++) {
+// Stops IDE complaining about possible NPE
+Assert.assertNotNull(settings);
+ByteUtil.setTwoBytes(settingFrame, (i * 6) + 9,
settings[i].getSetting());
+ByteUtil.setFourBytes(settingFrame, (i * 6) + 11,
settings[i].getValue());
+}
os.write(settingFrame);
os.flush();
@@ -798,4 +815,23 @@ public abstract class Http2TestBase exte
}
}
}
+
+
+static class Setting {
+private final int setting;
+private final long value;
+
+public Setting(int setting, long value) {
+this.setting = setting;
+this.value = value;
+}
+
+public int getSetting() {
+return setting;
+}
+
+public long getValue() {
+return value;
+}
+}
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_2.java?rev=1687278r1=1687277r2=1687278view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_2.java Wed Jun
24 13:55:44 2015
@@ -41,7 +41,7 @@ public class TestHttp2Section_5_2 extend
http2Connect();
// Set the default window size to 1024 bytes
-sendSetting(4, 1024);
+sendSettings(0, false, new Setting(4, 1024));
// Wait for the ack
parser.readFrame(true);
output.clearTrace();
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1687278r1=1687277r2=1687278view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Wed Jun
24 13:55:44 2015
@@ -62,7 +62,7 @@ public class TestHttp2Section_5_3 extend
}
// Set the default window size to 1024 bytes
-sendSetting(4, 1024);
+sendSettings(0, false, new Setting(4, 1024));
// Wait for the ack
parser.readFrame(true);
output.clearTrace();
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_5.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_5.java?rev=1687278r1=1687277r2=1687278view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_5.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_5.java Wed Jun
24 13:55:44 2015
@@ -53,7 +53,7 @@ public class TestHttp2Section_5_5 extend
http2Connect();
// Unknown setting (should be
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1452 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1687278 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1453 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1687292 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687268 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Author: violetagg
Date: Wed Jun 24 13:40:34 2015
New Revision: 1687268
URL: http://svn.apache.org/r1687268
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57700
ADD_CHILD_EVENT must be sent even when there are failures during child's start,
thus MapperListener will be added as Container/Lifecycle Listener and will be
able to receive events related to the corresponding Container.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1687268r1=1687267r2=1687268view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Jun 24
13:40:34 2015
@@ -717,19 +717,18 @@ public abstract class ContainerBase exte
// Start child
// Don't do this inside sync block - start can be a slow process and
// locking the children object can cause problems elsewhere
-if ((getState().isAvailable() ||
-LifecycleState.STARTING_PREP.equals(getState()))
-startChildren) {
-try {
+try {
+if ((getState().isAvailable() ||
+LifecycleState.STARTING_PREP.equals(getState()))
+startChildren) {
child.start();
-} catch (LifecycleException e) {
-log.error(ContainerBase.addChild: start: , e);
-throw new IllegalStateException
-(ContainerBase.addChild: start: + e);
}
+} catch (LifecycleException e) {
+log.error(ContainerBase.addChild: start: , e);
+throw new IllegalStateException(ContainerBase.addChild: start:
+ e);
+} finally {
+fireContainerEvent(ADD_CHILD_EVENT, child);
}
-
-fireContainerEvent(ADD_CHILD_EVENT, child);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687261 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/filters/ java/org/apache/tomcat/util/http/ test/org/apache/catalina/conn
Author: markt
Date: Wed Jun 24 13:26:06 2015
New Revision: 1687261
URL: http://svn.apache.org/r1687261
Log:
Make the (first) reason parameter parsing failed available as a request
attribute and then use it to provide a better status code via the
FailedRequstFilter (if configured).
Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1687261r1=1687260r2=1687261view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Jun 24 13:26:06 2015
@@ -213,6 +213,13 @@ public final class Globals {
/**
+ * The reason that the parameter parsing failed.
+ */
+public static final String PARAMETER_PARSE_FAILED_REASON_ATTR =
+org.apache.catalina.parameter_parse_failed_reason;
+
+
+/**
* The master flag which controls strict servlet specification
* compliance.
*/
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1687261r1=1687260r2=1687261view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Jun 24
13:26:06 2015
@@ -88,6 +88,7 @@ import org.apache.tomcat.util.buf.UDecod
import org.apache.tomcat.util.http.CookieProcessor;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.Parameters;
+import org.apache.tomcat.util.http.Parameters.FailReason;
import org.apache.tomcat.util.http.ServerCookie;
import org.apache.tomcat.util.http.ServerCookies;
import org.apache.tomcat.util.http.fileupload.FileItem;
@@ -2636,6 +2637,7 @@ public class Request
}
if (!location.isDirectory()) {
+
parameters.setParseFailedReason(FailReason.MULTIPART_CONFIG_INVALID);
partsParseException = new IOException(
sm.getString(coyoteRequest.uploadLocationInvalid,
location));
@@ -2648,6 +2650,7 @@ public class Request
try {
factory.setRepository(location.getCanonicalFile());
} catch (IOException ioe) {
+parameters.setParseFailedReason(FailReason.IO_ERROR);
partsParseException = ioe;
return;
}
@@ -2714,6 +2717,7 @@ public class Request
// Value separator
postSize++;
if (postSize maxPostSize) {
+
parameters.setParseFailedReason(FailReason.POST_TOO_LARGE);
throw new IllegalStateException(sm.getString(
coyoteRequest.maxPostSizeExceeded));
}
@@ -2724,19 +2728,23 @@ public class Request
success = true;
} catch (InvalidContentTypeException e) {
+
parameters.setParseFailedReason(FailReason.INVALID_CONTENT_TYPE);
partsParseException = new ServletException(e);
} catch (FileUploadBase.SizeException e) {
+parameters.setParseFailedReason(FailReason.POST_TOO_LARGE);
checkSwallowInput();
partsParseException = new IllegalStateException(e);
} catch (FileUploadException e) {
+parameters.setParseFailedReason(FailReason.IO_ERROR);
partsParseException = new IOException(e);
} catch (IllegalStateException e) {
+// addParameters() will set parseFailedReason
checkSwallowInput();
partsParseException = e;
}
} finally {
if (partsParseException != null || !success) {
-parameters.setParseFailed(true);
+parameters.setParseFailedReason(FailReason.UNKNOWN);
}
}
}
@@ -3015,6 +3023,7 @@ public class Request
sm.getString(coyoteRequest.postTooLarge));
}
checkSwallowInput();
+parameters.setParseFailedReason(FailReason.POST_TOO_LARGE);
return;
}
byte[] formData = null;
@@ -3028,6 +3037,7 @@ public class
[Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #10 from Mark Thomas ma...@apache.org --- I've patched trunk (9.0.x) to make the reason for the failure available as a request attribute that the FailedRequestFilter can then use to provide a better status code to the client. I'll give it a few days for folks to review and comment on the patch before back-porting it. -- 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
Re: [Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.
On 24/06/2015 14:43, Violeta Georgieva wrote: Hi Mark, 2015-06-24 16:27 GMT+03:00 bugzi...@apache.org: https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #10 from Mark Thomas ma...@apache.org --- I've patched trunk (9.0.x) to make the reason for the failure available as a request attribute that the FailedRequestFilter can then use to provide a better status code to the client. I'll give it a few days for folks to review and comment on the patch before back-porting it. Should I wait for this in order to include it in 7.0.63? Up to you. Personally, I view this as more of an enhancement than a bug fix but YMMV. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.
Mark, On 6/24/15 9:57 AM, Mark Thomas wrote: On 24/06/2015 14:43, Violeta Georgieva wrote: Hi Mark, 2015-06-24 16:27 GMT+03:00 bugzi...@apache.org: https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #10 from Mark Thomas ma...@apache.org --- I've patched trunk (9.0.x) to make the reason for the failure available as a request attribute that the FailedRequestFilter can then use to provide a better status code to the client. I'll give it a few days for folks to review and comment on the patch before back-porting it. Should I wait for this in order to include it in 7.0.63? Up to you. Personally, I view this as more of an enhancement than a bug fix but YMMV. +1 I think it can wait for 7.0.64. -chris signature.asc Description: OpenPGP digital signature
Re: [Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.
Hi Mark, 2015-06-24 16:27 GMT+03:00 bugzi...@apache.org: https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #10 from Mark Thomas ma...@apache.org --- I've patched trunk (9.0.x) to make the reason for the failure available as a request attribute that the FailedRequestFilter can then use to provide a better status code to the client. I'll give it a few days for folks to review and comment on the patch before back-porting it. Should I wait for this in order to include it in 7.0.63? Thanks, Violeta -- 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
[Bug 58074] Memory leak - session serialization
https://bz.apache.org/bugzilla/show_bug.cgi?id=58074 --- Comment #2 from qed...@gmail.com --- (In reply to Mark Thomas from comment #1) A profiler confirms that there is no memory leak here. weak references != memory leaks. GC will clear them as/if necessary to relieve memory pressure. I must confirm that you are correct. I didn't believe it, but multiple redeployment of my app showed PermGen space growth UNTIL MAX limit was reached (I pressed Perform GC in the meantime as much as I could - with no effect) and then, SUDDENLY when the crucial reload was made - the one I hoped to crash Tomcat - ALL PermGen space occupied by leaks was freed AND Find leaks button suddenly showed No web applications appear to have triggered a memory leak. I must be more careful next time with issuing bug reports. Thanks for answer. -- 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: r1687292 - /tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Author: markt
Date: Wed Jun 24 14:15:32 2015
New Revision: 1687292
URL: http://svn.apache.org/r1687292
Log:
Correct error code
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1687292r1=1687291r2=1687292view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Wed Jun
24 14:15:32 2015
@@ -117,7 +117,7 @@ public class ConnectionSettings {
if (initialWindowSize MAX_WINDOW_SIZE) {
throw new
ConnectionException(sm.getString(connectionSettings.windowSizeTooBig,
Long.toString(initialWindowSize),
Long.toString(MAX_WINDOW_SIZE)),
-Http2Error.PROTOCOL_ERROR);
+Http2Error.FLOW_CONTROL_ERROR);
}
this.initialWindowSize = (int) initialWindowSize;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for Tomcat 7.0.63?
Violeta, On 6/24/15 2:34 AM, Violeta Georgieva wrote: Hi, 2015-06-23 20:53 GMT+03:00 Christopher Schultz ch...@christopherschultz.net : All, Some recent bugs have been fixed and there is some community demand for 7.0.63. e.g. https://bz.apache.org/bugzilla/show_bug.cgi?id=57783 Violetta, are you up for another release? I want to fix this one https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 Also I want to check this one https://bz.apache.org/bugzilla/show_bug.cgi?id=58063 So my plans are to start with Tomcat 7.0.63 preparation in 2-3 days. Sounds great, thanks. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1687342 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java
Author: markt Date: Wed Jun 24 18:45:59 2015 New Revision: 1687342 URL: http://svn.apache.org/r1687342 Log: (empty) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 24 18:45:59 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
[Bug 57546] Memory Leak in SecureNioChannel
https://bz.apache.org/bugzilla/show_bug.cgi?id=57546 --- Comment #14 from Mark Thomas ma...@apache.org --- (In reply to Paul Gaylie from comment #13) Created attachment 32854 [details] Screen Shot from hprof Guys, Please consider using a more gender neutral form of address when addressing the Tomcat committers. I installed Tomcat 8.0.22 on our production server. Unfortunately, the memory leak is still there. If you look at the attachment TomcatLeak2.jpg you will see 2,968 items in the connections HashMap. There should be 1,718. I am not sure what to suggest other than re-running the connection crash test. I can send you the hprof file but it is over 1 GB. It looks like there are multiple issues. Please open a new bug. As with any bug, you'll need to provide the steps to reproduce the issue on a clean install of the latest stable release of the version (8.0.x in this case) where you see the issue. -- 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: r1687340 - /tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
Author: markt
Date: Wed Jun 24 18:44:18 2015
New Revision: 1687340
URL: http://svn.apache.org/r1687340
Log:
Fix FindBugs warning. Don't use != with Strings
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1687340r1=1687339r2=1687340view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Wed Jun
24 18:44:18 2015
@@ -859,7 +859,7 @@ public class RemoteIpFilter implements F
}
HttpServletResponse xResponse;
-if (xRequest.getScheme() != request.getScheme() ||
+if (!xRequest.getScheme().equals(request.getScheme()) ||
xRequest.getServerPort() != request.getServerPort()) {
xResponse = new XForwardedResponse(response,
xRequest.getScheme(), xRequest.getServerPort());
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687341 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java
Author: markt Date: Wed Jun 24 18:45:20 2015 New Revision: 1687341 URL: http://svn.apache.org/r1687341 Log: Fix FindBugs warning. Don't use != with Strings Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 24 18:45:20 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,1687268
Re: [Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.
2015-06-24 18:37 GMT+03:00 Christopher Schultz ch...@christopherschultz.net : Mark, On 6/24/15 9:57 AM, Mark Thomas wrote: On 24/06/2015 14:43, Violeta Georgieva wrote: Hi Mark, 2015-06-24 16:27 GMT+03:00 bugzi...@apache.org: https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #10 from Mark Thomas ma...@apache.org --- I've patched trunk (9.0.x) to make the reason for the failure available as a request attribute that the FailedRequestFilter can then use to provide a better status code to the client. I'll give it a few days for folks to review and comment on the patch before back-porting it. Should I wait for this in order to include it in 7.0.63? Up to you. Personally, I view this as more of an enhancement than a bug fix but YMMV. +1 I think it can wait for 7.0.64. OK Thanks, Violeta -chris
[Bug 57700] Exception in a LifecycleListener on Context makes webapp unreachable in spite of subsequent successful startups
https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #9 from Violeta Georgieva violet...@apache.org --- Fix is available in trunk, in 8.0.x for 8.0.24 and in 7.0.x for 7.0.63 onwards. -- 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: r1687333 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java webapps/docs/changelog.xml
Author: violetagg Date: Wed Jun 24 17:33:17 2015 New Revision: 1687333 URL: http://svn.apache.org/r1687333 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 Merged revision 1687268 from tomcat/trunk: ADD_CHILD_EVENT must be sent even when there are failures during child's start, thus MapperListener will be added as Container/Lifecycle Listener and will be able to receive events related to the corresponding Container. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 24 17:33:17 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891
svn commit: r1687334 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java webapps/docs/changelog.xml
Author: violetagg Date: Wed Jun 24 17:37:39 2015 New Revision: 1687334 URL: http://svn.apache.org/r1687334 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 Merged revision 1687268 from tomcat/trunk: ADD_CHILD_EVENT must be sent even when there are failures during child's start, thus MapperListener will be added as Container/Lifecycle Listener and will be able to receive events related to the corresponding Container. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 24 17:37:39 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
[Bug 57546] Memory Leak in SecureNioChannel
https://bz.apache.org/bugzilla/show_bug.cgi?id=57546 Paul Gaylie paul.gay...@gmail.com changed: What|Removed |Added CC||paul.gay...@gmail.com --- Comment #13 from Paul Gaylie paul.gay...@gmail.com --- Created attachment 32854 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32854action=edit Screen Shot from hprof Guys, I installed Tomcat 8.0.22 on our production server. Unfortunately, the memory leak is still there. If you look at the attachment TomcatLeak2.jpg you will see 2,968 items in the connections HashMap. There should be 1,718. I am not sure what to suggest other than re-running the connection crash test. I can send you the hprof file but it is over 1 GB. -- 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
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/689 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1687342 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/302 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1687333 Blamelist: violetagg Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/303 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1687341 Blamelist: markt BUILD FAILED: exception svn upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687350 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt
Date: Wed Jun 24 19:37:02 2015
New Revision: 1687350
URL: http://svn.apache.org/r1687350
Log:
Fix logic
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1687350r1=1687349r2=1687350view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Jun
24 19:37:02 2015
@@ -811,7 +811,7 @@ public class Http2UpgradeHandler extends
stream.checkState(FrameType.HEADERS);
stream.receivedStartOfHeaders();
closeIdleStreams(streamId);
-if (localSettings.getMaxConcurrentStreams()
activeRemoteStreamCount.incrementAndGet()) {
+if (localSettings.getMaxConcurrentStreams() =
activeRemoteStreamCount.incrementAndGet()) {
activeRemoteStreamCount.decrementAndGet();
throw new
StreamException(sm.getString(upgradeHandler.tooManyRemoteStreams,
Long.toString(localSettings.getMaxConcurrentStreams())),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687351 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt
Date: Wed Jun 24 19:44:51 2015
New Revision: 1687351
URL: http://svn.apache.org/r1687351
Log:
Correct boundary condition
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1687351r1=1687350r2=1687351view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Jun
24 19:44:51 2015
@@ -811,7 +811,7 @@ public class Http2UpgradeHandler extends
stream.checkState(FrameType.HEADERS);
stream.receivedStartOfHeaders();
closeIdleStreams(streamId);
-if (localSettings.getMaxConcurrentStreams() =
activeRemoteStreamCount.incrementAndGet()) {
+if (localSettings.getMaxConcurrentStreams()
activeRemoteStreamCount.incrementAndGet()) {
activeRemoteStreamCount.decrementAndGet();
throw new
StreamException(sm.getString(upgradeHandler.tooManyRemoteStreams,
Long.toString(localSettings.getMaxConcurrentStreams())),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687352 - /tomcat/trunk/res/findbugs/filter-false-positives.xml
Author: markt Date: Wed Jun 24 19:45:46 2015 New Revision: 1687352 URL: http://svn.apache.org/r1687352 Log: Add some more false positives Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1687352r1=1687351r2=1687352view=diff == --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Wed Jun 24 19:45:46 2015 @@ -201,6 +201,13 @@ Bug code=SQL / /Match Match +!-- Correct behaviour does not assume sequential operations on concurrent + hash map are atomic. -- +Class name=org.apache.coyote.AbstractProtocol$AbstractConnectionHandler / +Method name=process / +Bug pattern=AT_OPERATION_SEQUENCE_ON_CONCURRENT_ABSTRACTION / + /Match + Match !-- Locks are always released. Non-standard pattern is required because -- !-- of lock upgrade that is used. -- Class name=org.apache.coyote.http11.upgrade.AprServletInputStream / @@ -229,6 +236,24 @@ Bug code=UL / /Match Match +!-- Number being tested is unsigned. -- +Class name=org.apache.coyote.http2.Http2UpgradeHandler / +Method name=createRemoteStream / +Bug pattern=IM_BAD_CHECK_FOR_ODD / + /Match + Match +!-- Notify is correct. Condition changed outside of this method. -- +Class name=org.apache.coyote.http2.Http2UpgradeHandler / +Mehtod name=releaseBackLog / +Bug pattern=NN_NAKED_NOTIFY / + /Match + Match +!-- Notify is correct. Condition changed outside of this method. -- +Class name=org.apache.coyote.http2.Stream / +Mehtod name=incrementWindowSize / +Bug pattern=NN_NAKED_NOTIFY / + /Match + Match !-- Returning null is required by the EL specification -- Class name=org.apache.el.lang.ELSupport / Method name=coerceToBoolean/ @@ -454,7 +479,10 @@ /Match Match !-- Object is only ever set to null, sync therefore is still valid -- -Class name=org.apache.tomcat.util.net.NioEndpoint$SocketProcessor/ +Or + Class name=org.apache.tomcat.util.net.NioEndpoint$SocketProcessor/ + Class name=org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor/ +/Or Method name=run/ Bug code=ML/ /Match - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1454 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1687340 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687346 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt
Date: Wed Jun 24 19:10:57 2015
New Revision: 1687346
URL: http://svn.apache.org/r1687346
Log:
Fix FindBugs warnings. activeRemoteStreamCount wasn't thread safe.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1687346r1=1687345r2=1687346view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Jun
24 19:10:57 2015
@@ -117,7 +117,7 @@ public class Http2UpgradeHandler extends
private long writeTimeout = 1;
private final MapInteger,Stream streams = new HashMap();
-private volatile int activeRemoteStreamCount = 0;
+private final AtomicInteger activeRemoteStreamCount = new AtomicInteger(0);
private volatile int maxRemoteStreamId = 0;
// Start at -1 so the 'add 2' logic in closeIdleStreams() works
private volatile int maxActiveRemoteStreamId = -1;
@@ -144,7 +144,7 @@ public class Http2UpgradeHandler extends
streams.put(key, stream);
maxRemoteStreamId = 1;
maxActiveRemoteStreamId = 1;
-activeRemoteStreamCount = 1;
+activeRemoteStreamCount.set(1);
maxProcessedStreamId = 1;
}
}
@@ -449,7 +449,7 @@ public class Http2UpgradeHandler extends
header[4] = FLAG_END_OF_STREAM;
stream.sentEndOfStream();
if (!stream.isActive()) {
-activeRemoteStreamCount--;
+activeRemoteStreamCount.decrementAndGet();
}
}
ByteUtil.set31Bits(header, 5, stream.getIdentifier().intValue());
@@ -788,7 +788,7 @@ public class Http2UpgradeHandler extends
Stream stream = getStream(streamId, true);
stream.receivedEndOfStream();
if (!stream.isActive()) {
-activeRemoteStreamCount--;
+activeRemoteStreamCount.decrementAndGet();
}
}
@@ -811,9 +811,8 @@ public class Http2UpgradeHandler extends
stream.checkState(FrameType.HEADERS);
stream.receivedStartOfHeaders();
closeIdleStreams(streamId);
-if (localSettings.getMaxConcurrentStreams() activeRemoteStreamCount)
{
-activeRemoteStreamCount++;
-} else {
+if (localSettings.getMaxConcurrentStreams()
activeRemoteStreamCount.incrementAndGet()) {
+activeRemoteStreamCount.decrementAndGet();
throw new
StreamException(sm.getString(upgradeHandler.tooManyRemoteStreams,
Long.toString(localSettings.getMaxConcurrentStreams())),
Http2Error.REFUSED_STREAM, streamId);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1687349 - /tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PrincipalGroupCallback.java
Author: markt
Date: Wed Jun 24 19:26:00 2015
New Revision: 1687349
URL: http://svn.apache.org/r1687349
Log:
Fix copy/paste error spotted by FindBugs
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PrincipalGroupCallback.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PrincipalGroupCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PrincipalGroupCallback.java?rev=1687349r1=1687348r2=1687349view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PrincipalGroupCallback.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PrincipalGroupCallback.java
Wed Jun 24 19:26:00 2015
@@ -60,7 +60,7 @@ public class PrincipalGroupCallback {
return callerPrincipalCallback.getSubject();
}
if (groupPrincipalCallback != null) {
-return callerPrincipalCallback.getSubject();
+return groupPrincipalCallback.getSubject();
}
return null;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
