[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 --- Comment #16 from Remy Maucherat --- Without a relatively simple test case, I think this should be closed for the time being. There has to be some concurrency involved and the framework really gets in the 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
[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 --- Comment #15 from Justin --- Retested and reconfirmed problem with /trunk@1685924. Attached exceptions. -- 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 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 --- Comment #14 from Justin --- Created attachment 32830 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32830&action=edit Exceptions -- 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 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #7 from Konstantin Kolinko --- (In reply to Mark Thomas from comment #5) > I was thinking a using the existing attribute to trigger a 400 response and > a new attribute to trigger a 413 response. That should cover all the current > possibilities for parameter/part issues. -1. By my '-1' vote I mean that when "using a new attribute to trigger a 413 response" I am against changing the meaning of the existing attribute. If something failed, the existing attribute should continue to indicate failure. It can be 1) Globals.PARAMETER_PARSE_FAILED_ATTR to signal presence of an error 2) additional attribute to signal the kind of an error. Originally when introducing PARAMETER_PARSE_FAILED_ATTR I have not defined what its value is. It was documented as "absent = success", "any not-null value = failure" with an intent to introduce different not-null values for different use cases. Nowadays javadoc for Globals.PARAMETER_PARSE_FAILED_ATTR explicitly mentions Boolean.TRUE as the value. Thus for compatibility it is better to go with a separate attribute to communicate the reason of the failure. Technically, PARAMETER_PARSE_FAILED_ATTR is a facade that exposes the value of internal coyoteRequest.getParameters().isParseFailed() flag. For reference: r1200218 Historically this attribute and FailedRequestFilter were introduced as a review of CVE-2012-0022 fix that introduced "maxParameterCount" limit. The intent was to be able to perform a simple test that none parameters were lost. Also I think that exceeding the "maxParameterCount" limit also would better result in response status 413. I wish there were a Servlet API way to communicate parameter processing errors. HttpServletRequest.getParts() and getPart() methods implement some way to indicate errors by throwing an exception, but an IllegalStateException thrown there is used to indicate both "size limit exceeded" and "missing multipart-config" conditions. [1] There exist "javax.servlet.error.exception" and other standard Request attributes as defined in ch.10.9.1 of Servlet 3.1 specification, but IIRC they are used only when performing an error processing dispatch. [1] http://docs.oracle.com/javaee/7/api/javax/servlet/http/HttpServletRequest.html#getParts%28%29 -- 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 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #6 from Konstantin Kolinko --- (In reply to Christopher L. Simons from comment #4) > > Unconditionally sending a 400 from FailedRequestFilter upon failure seems > incorrect as the HTTP spec states that 400 is to be used when the request > failed "due to malformed syntax,"[1] > > [1] HTTP/1.1: Status Code Definitions > http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.1 In my opinion, it would be nice to use 413, but it is not wrong to use 400. "400" is just the generic error code in 4xx series. It says "it is client's fault". Nothing more. Likewise "500" is the generic error code in 5xx series. Note that RFC2616 is obsolete. Current specification for HTTP/1.1 status codes is RFC 7231: http://tools.ietf.org/html/rfc7231#section-6.5.1 HTTP RFCs are listed at https://wiki.apache.org/tomcat/Specifications#HTTP -- 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 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #5 from Mark Thomas --- I was thinking a using the existing attribute to trigger a 400 response and a new attribute to trigger a 413 response. That should cover all the current possibilities for parameter/part issues. Note RFC 2616 is obsolete. -- 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: r1685915 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Tue Jun 16 21:54:52 2015
New Revision: 1685915
URL: http://svn.apache.org/r1685915
Log:
Implement an HTTP/2 TODO. Add the last 'processed' stream ID to anyGOAWAY frame
sent. 'processed' means passed the container did some processing.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.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=1685915&r1=1685914&r2=1685915&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Jun
16 21:54:52 2015
@@ -121,6 +121,7 @@ public class Http2UpgradeHandler extends
private volatile int maxRemoteStreamId = 0;
// Start at -1 so the 'add 2' logic in closeIdleStreams() works
private volatile int maxActiveRemoteStreamId = -1;
+private volatile int maxProcessedStreamId;
// Tracking for when the connection is blocked (windowSize < 1)
private final Object backLogLock = new Object();
@@ -144,6 +145,7 @@ public class Http2UpgradeHandler extends
maxRemoteStreamId = 1;
maxActiveRemoteStreamId = 1;
activeRemoteStreamCount = 1;
+maxProcessedStreamId = 1;
}
}
@@ -378,8 +380,7 @@ public class Http2UpgradeHandler extends
private void closeConnection(Http2Exception ce) {
// Write a GOAWAY frame.
byte[] fixedPayload = new byte[8];
-// TODO needs to be correct value
-ByteUtil.set31Bits(fixedPayload, 0, (2 << 31) - 1);
+ByteUtil.set31Bits(fixedPayload, 0, maxProcessedStreamId);
ByteUtil.setFourBytes(fixedPayload, 4, ce.getError().getCode());
byte[] debugMessage = ce.getMessage().getBytes(StandardCharsets.UTF_8);
byte[] payloadLength = new byte[3];
@@ -859,6 +860,7 @@ public class Http2UpgradeHandler extends
@Override
public void headersEnd(int streamId) throws ConnectionException {
+setMaxProcessedStream(streamId);
Stream stream = getStream(streamId, true);
// Process this stream on a container thread
StreamProcessor streamProcessor = new StreamProcessor(stream, adapter,
socketWrapper);
@@ -867,6 +869,12 @@ public class Http2UpgradeHandler extends
}
+private void setMaxProcessedStream(int streamId) {
+if (maxProcessedStreamId < streamId) {
+maxProcessedStreamId = streamId;
+}
+}
+
@Override
public void reset(int streamId, long errorCode) throws Http2Exception {
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java?rev=1685915&r1=1685914&r2=1685915&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java Tue Jun
16 21:54:52 2015
@@ -58,9 +58,8 @@ public class TestHttp2Section_4_2 extend
// Read GOAWAY frame
parser.readFrame(true);
-Assert.assertTrue(output.getTrace(),
-output.getTrace().startsWith("0-Goaway-[2147483647]-[" +
-Http2Error.FRAME_SIZE_ERROR.getCode() + "]-["));
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+"0-Goaway-[1]-[" + Http2Error.FRAME_SIZE_ERROR.getCode() +
"]-["));
}
@Test
@@ -85,9 +84,8 @@ public class TestHttp2Section_4_2 extend
// Read GOAWAY frame
parser.readFrame(true);
-Assert.assertTrue(output.getTrace(),
-output.getTrace().startsWith("0-Goaway-[2147483647]-[" +
-Http2Error.FRAME_SIZE_ERROR.getCode() + "]-["));
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+"0-Goaway-[1]-[" + Http2Error.FRAME_SIZE_ERROR.getCode() +
"]-["));
}
@@ -112,9 +110,8 @@ public class TestHttp2Section_4_2 extend
// Read GOAWAY frame
parser.readFrame(true);
-Assert.assertTrue(output.getTrace(),
-output.getTrace().startsWith("0-Goaway-[2147483647]-[" +
-Http2Error.FRAME_SIZE_ERROR.getCode() + "]-["));
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+"0-Goaway-[1]-[" + Http2Error.FRAME_SIZE_ERROR.getCode() +
"]-["));
}
Modified: tomcat/trunk/test/org/apache/coyot
svn commit: r1685913 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2Parser.java java/org/apache/coyote/http2/LocalStrings.properties test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt
Date: Tue Jun 16 21:36:56 2015
New Revision: 1685913
URL: http://svn.apache.org/r1685913
Log:
HTTP/2 streams may not depend on themselves.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1685913&r1=1685912&r2=1685913&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Tue Jun 16
21:36:56 2015
@@ -231,6 +231,11 @@ class Http2Parser {
int parentStreamId = ByteUtil.get31Bits(payload, 0);
int weight = ByteUtil.getOneByte(payload, 4) + 1;
+if (streamId == parentStreamId) {
+throw new
StreamException(sm.getString("http2Parser.processFramePriority.invalidParent",
+connectionId, Integer.valueOf(streamId)),
Http2Error.PROTOCOL_ERROR, streamId);
+}
+
output.reprioritise(streamId, parentStreamId, exclusive, weight);
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1685913&r1=1685912&r2=1685913&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue Jun
16 21:36:56 2015
@@ -48,6 +48,7 @@ http2Parser.processFrameGoaway.payloadTo
http2Parser.processFrameHeaders.decodingFailed=There was an error during the
HPACK decoding of HTTP headers
http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK
decoding - it should have been consumed
http2Parser.processFramePing.invalidPayloadSize=Settings frame received with
an invalid payload size of [{0}] (should be 8)
+http2Parser.processFramePriority.invalidParent=Connection [{0}], Stream [{1}],
A stream may not depend on itself
http2Parser.processFramePriority.invalidPayloadSize=Priority frame received
with an invalid payload size of [{0}] (should be 5)
http2Parser.processFramePushPromise=Connection [{0}], Stream [{1}], Push
promise frames should not be sent by the client
http2Parser.processFrameSettings.ackWithNonZeroPayload=Settings frame received
with the ACK flag set and payload present
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=1685913&r1=1685912&r2=1685913&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Jun
16 21:36:56 2015
@@ -31,6 +31,20 @@ import org.junit.Test;
*/
public class TestHttp2Section_5_3 extends Http2TestBase {
+// Section 5.3.1
+
+@Test
+public void testStreamDependsOnSelf() throws Exception {
+http2Connect();
+
+sendPriority(3, 3, 15);
+
+parser.readFrame(true);
+
+Assert.assertEquals("3-RST-[1]", output.getTrace());
+}
+
+
// Section 5.3.2
@Test
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #4 from Christopher L. Simons --- (In reply to Christopher Schultz from comment #1) > Look into how Globals.PARAMETER_PARSE_FAILED_ATTR is used to communicate > this situation to the application and see if you can come up with something > that might work better than your current proposal. It appears that both checks for maxPostSize do result in Globals.PARAMETER_PARSE_FAILED_ATTR being set: in Request#parseParts, an exception is thrown, and in the finally block of the try/catch/finally block parameters.setParseFailed(true) is set. In Request#parseParameters, the try/catch/finally block is exited without setting 'success' to true, and the finally block calls parameters.setParseFailed(true) in this case. So it appears the original concern about return 200 in this case is addressed. The documentation for maxParameterCount notes that FailedRequestFilter can be used to reject requests that exceed this limit. I've attached a patch to include the same note in the maxPostSize documentation after verifying 400 is returned in this case (as noted above). > It does almost what you want, except that it returns a 400 response instead > of 413 Unconditionally sending a 400 from FailedRequestFilter upon failure seems incorrect as the HTTP spec states that 400 is to be used when the request failed "due to malformed syntax,"[1] which isn't the case for maxPostSize and maxParameterCount violations; in some parse failure cases 400 is correct, but for these violations 413 seems more appropriate. I'd propose implementing a mechanism to indicate from the parsing code which status should be returned from FailedRequestParameter. Thoughts? [1] HTTP/1.1: Status Code Definitions http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.1 -- 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 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 Christopher L. Simons changed: What|Removed |Added Attachment #32821|0 |1 is obsolete|| --- Comment #3 from Christopher L. Simons --- Created attachment 32829 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32829&action=edit Add FailedRequestFilter note to maxPostSize documentation. -- 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 56397] Establish parallel Maven-based build process
https://bz.apache.org/bugzilla/show_bug.cgi?id=56397 Mark Thomas changed: What|Removed |Added Resolution|--- |LATER Status|NEW |RESOLVED --- Comment #49 from Mark Thomas --- This is in place (with no much interest for a while now) so as per comment #1 I'm closing this as LATER. We can resurrect this issue then next time the "Why doesn't Tomcat move to Maven?" thread kicks off on dev. -- 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: Multi-threaded unit tests
On 16/06/2015 21:43, Christopher Schultz wrote: > Mark, > > On 6/16/15 4:13 PM, Mark Thomas wrote: >> On 16/06/2015 20:39, Christopher Schultz wrote: >>> Mark, >>> >>> On 6/15/15 8:02 AM, Mark Thomas wrote: I have been experimenting with the free Azure credits that come with the MSDN subscription Microsoft kindly offers to all Apache committers to use for their ASF work. I have been looking at options for making the unit tests run faster. All the figures below are for running the trunk unit tests on a fully updated Ubuntu 14.04 LTS instance. A2 Basic 233:53 tests on hdd, with code coverage, 1 thread D2 120:57 tests on hdd, with code coverage, 1 thread D2 119:53 tests on ssd, with code coverage, 1 thread D232:16 tests on hdd, no code coverage, 2 threads D223:24 tests on hdd, no code coverage, 4 threads (Both A2 and D2 boxes have 2 cores. D2 have 60% faster processors). I'll be testing larger instance with more cores later. So far, I think it is safe to draw the following conclusions: - code coverage is expensive - code coverage (as currently configured) requires single thread execution (more on this below) - 1 test thread per core definitely gives better performance - 2 test threads per core gives even better performance >>> >>> Obviously, code coverage and CPU power (more likely access to the CPU, >>> not the CPU speed itself) are bigger factors in the equation, here. >> >> Comparing A2 and D2 above, the only difference is CPU speed. > > I don't know anything about Azure specifically, but I do know that in > AWS the virtual machine classes include both differences in the CPU > itself (the hardware) and also access to certain numbers of cores. So > for example, they may have a 16-core box, but your VM will be limited to > at most one of them at a time. I was wondering if Azure did the same > kind of thing. No idea. I'm using core in whatever way Azure means it. My assumption (that seems to be backed up by the results) is that core == ability to run a concurrent thread. >>> Multi-threaded is nice, but it's marginal compared to the other factors >>> (which are orders of magnitude at this point). >> >> Not when you increase the number of cores it isn't. > > Okay, we'll see with more data. Your numbers below are encouraging. > > When you say "core", do you mean CPU or CPU-thread? For example, most > Intel processors these days have hyperthreading which means two threads > per core. I have a quad-core laptop but I can have 8 > simultaneously-executing processes. > > I'm curious as to why you are getting I/O timeouts when you use Nthreads >> Ncores, but I suppose that depends upon the way you count. On my > laptop, does that mean I shouldn't exceed 4 threads or 8 threads? The context switching when you use more threads than your hardware can handle concurrently can introduce enough of a delay that a I/O timeout occurs. >> I think that is more effort than it took to get the multi-threaded tests >> working. You'll need to set up parallel junit tests in Ant, manage the >> separate code coverage files and then merge the result. > > Hmm. Merging the results would be ugly, especially if we have to figure > out how two separate runs of Cobertura ran over the same piece of code > (we might have some cross-over). > > Or we could just have two separate reports ;) There is a cobertura utility to do the merge for you. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #2 from Mark Thomas --- Agreed. The right response is definitely going to be application dependent. Most of the problem stems from getParameterXXX() methods not declaring any exceptions. We also run the risk of breaking lots of stuff if we start sending 413 responses where we currently send a 200 response. On balance I think setting some a custom request attribute that an application can check if they want to (and if not the current behaviour continues) along the lines of Globals.PARAMETER_PARSE_FAILED_ATTR is going to be the way to go. -- 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: Multi-threaded unit tests
Mark, On 6/16/15 4:13 PM, Mark Thomas wrote: > On 16/06/2015 20:39, Christopher Schultz wrote: >> Mark, >> >> On 6/15/15 8:02 AM, Mark Thomas wrote: >>> I have been experimenting with the free Azure credits that come with the >>> MSDN subscription Microsoft kindly offers to all Apache committers to >>> use for their ASF work. >>> >>> I have been looking at options for making the unit tests run faster. >>> >>> All the figures below are for running the trunk unit tests on a fully >>> updated Ubuntu 14.04 LTS instance. >>> >>> >>> A2 Basic 233:53 tests on hdd, with code coverage, 1 thread >>> D2 120:57 tests on hdd, with code coverage, 1 thread >>> D2 119:53 tests on ssd, with code coverage, 1 thread >>> D232:16 tests on hdd, no code coverage, 2 threads >>> D223:24 tests on hdd, no code coverage, 4 threads >>> >>> (Both A2 and D2 boxes have 2 cores. D2 have 60% faster processors). >>> >>> I'll be testing larger instance with more cores later. >>> >>> So far, I think it is safe to draw the following conclusions: >>> - code coverage is expensive >>> - code coverage (as currently configured) requires single thread >>> execution (more on this below) >>> - 1 test thread per core definitely gives better performance >>> - 2 test threads per core gives even better performance >> >> Obviously, code coverage and CPU power (more likely access to the CPU, >> not the CPU speed itself) are bigger factors in the equation, here. > > Comparing A2 and D2 above, the only difference is CPU speed. I don't know anything about Azure specifically, but I do know that in AWS the virtual machine classes include both differences in the CPU itself (the hardware) and also access to certain numbers of cores. So for example, they may have a 16-core box, but your VM will be limited to at most one of them at a time. I was wondering if Azure did the same kind of thing. >> Multi-threaded is nice, but it's marginal compared to the other factors >> (which are orders of magnitude at this point). > > Not when you increase the number of cores it isn't. Okay, we'll see with more data. Your numbers below are encouraging. When you say "core", do you mean CPU or CPU-thread? For example, most Intel processors these days have hyperthreading which means two threads per core. I have a quad-core laptop but I can have 8 simultaneously-executing processes. I'm curious as to why you are getting I/O timeouts when you use Nthreads > Ncores, but I suppose that depends upon the way you count. On my laptop, does that mean I shouldn't exceed 4 threads or 8 threads? >> One more data point would have been good to have: >> >> D2???:?? tests on hdd, no code coverage, 1 thread > > Agreed. I'll set a test running and see where it ends up. > > Some more figures I do have: > > D8 09:53 tests on hdd, no code coverage, 8 threads (8 core box). > > On my laptop (4 core) the time taken to run the unit tests dropped from > ~60 mins to ~15 mins with 4 threads (pretty much linear). > >>> Where the limit is for threads per core is TBD. >>> >>> I've already fixed the unit tests (I think) so parallel running is >>> possible. I'll be adding a threads option to build.xml shortly. It will >>> default to 1 and I'll add a comment to build.properties.default not to >>> increase it above 1 if code coverage is enabled (I might try and detect >>> and handle that case). Once I have data on threads vs cores I'll add >>> that too. >>> >>> The reason code coverage doesn't work with the junit threads option is >>> that cobertura serialises the coverage data between tests. If we >>> partitioned the tests (e.g. by name) and configured separated coverage >>> data files for each partition (merging them at the end) then cobertura >>> would be OK. Sensibly partitioning the tests is more effort than I have >>> time for at the moment so I am going with the simple option. >> >> If doubling the number of threads delivers a ~30% performance >> improvement in the code coverage (just extrapolating the results for >> merely running the tests over to code-coverage), then perhaps a >> heavy-handed segmentation of the Cobertura tests into two >> arbitrarily-selected sets of tests would be a good trial with not too >> much effort to give it a try. >> >> What do you think? > > I think that is more effort than it took to get the multi-threaded tests > working. You'll need to set up parallel junit tests in Ant, manage the > separate code coverage files and then merge the result. Hmm. Merging the results would be ugly, especially if we have to figure out how two separate runs of Cobertura ran over the same piece of code (we might have some cross-over). Or we could just have two separate reports ;) -chris signature.asc Description: OpenPGP digital signature
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/1393 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] 1685891 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
[Bug 57938] HttpServletRequest.getParts causes NPE when allowCasualMultipartParsing set "true" and multipart field is empty
https://bz.apache.org/bugzilla/show_bug.cgi?id=57938 --- Comment #4 from Mark Thomas --- (In reply to Christopher Schultz from comment #3) > (In reply to Mark Thomas from comment #2) > > maxPostSize=0 was really a bug in how allowCasualMultipartParsing was > > implemented but I opted to switch the meaning if zero to a limit of zero > > since a) it is more intuitive and b) it aligns with maxSavePostSize. > > I'm interested (since I wrote it), what was the "real" bug? It didn't handle the 0 == no limit case -- 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: Multi-threaded unit tests
On 16/06/2015 20:39, Christopher Schultz wrote: > Mark, > > On 6/15/15 8:02 AM, Mark Thomas wrote: >> I have been experimenting with the free Azure credits that come with the >> MSDN subscription Microsoft kindly offers to all Apache committers to >> use for their ASF work. >> >> I have been looking at options for making the unit tests run faster. >> >> All the figures below are for running the trunk unit tests on a fully >> updated Ubuntu 14.04 LTS instance. >> >> >> A2 Basic 233:53 tests on hdd, with code coverage, 1 thread >> D2 120:57 tests on hdd, with code coverage, 1 thread >> D2 119:53 tests on ssd, with code coverage, 1 thread >> D232:16 tests on hdd, no code coverage, 2 threads >> D223:24 tests on hdd, no code coverage, 4 threads >> >> (Both A2 and D2 boxes have 2 cores. D2 have 60% faster processors). >> >> I'll be testing larger instance with more cores later. >> >> So far, I think it is safe to draw the following conclusions: >> - code coverage is expensive >> - code coverage (as currently configured) requires single thread >> execution (more on this below) >> - 1 test thread per core definitely gives better performance >> - 2 test threads per core gives even better performance > > Obviously, code coverage and CPU power (more likely access to the CPU, > not the CPU speed itself) are bigger factors in the equation, here. Comparing A2 and D2 above, the only difference is CPU speed. > Multi-threaded is nice, but it's marginal compared to the other factors > (which are orders of magnitude at this point). Not when you increase the number of cores it isn't. > One more data point would have been good to have: > > D2???:?? tests on hdd, no code coverage, 1 thread Agreed. I'll set a test running and see where it ends up. Some more figures I do have: D8 09:53 tests on hdd, no code coverage, 8 threads (8 core box). On my laptop (4 core) the time taken to run the unit tests dropped from ~60 mins to ~15 mins with 4 threads (pretty much linear). >> Where the limit is for threads per core is TBD. >> >> I've already fixed the unit tests (I think) so parallel running is >> possible. I'll be adding a threads option to build.xml shortly. It will >> default to 1 and I'll add a comment to build.properties.default not to >> increase it above 1 if code coverage is enabled (I might try and detect >> and handle that case). Once I have data on threads vs cores I'll add >> that too. >> >> The reason code coverage doesn't work with the junit threads option is >> that cobertura serialises the coverage data between tests. If we >> partitioned the tests (e.g. by name) and configured separated coverage >> data files for each partition (merging them at the end) then cobertura >> would be OK. Sensibly partitioning the tests is more effort than I have >> time for at the moment so I am going with the simple option. > > If doubling the number of threads delivers a ~30% performance > improvement in the code coverage (just extrapolating the results for > merely running the tests over to code-coverage), then perhaps a > heavy-handed segmentation of the Cobertura tests into two > arbitrarily-selected sets of tests would be a good trial with not too > much effort to give it a try. > > What do you think? I think that is more effort than it took to get the multi-threaded tests working. You'll need to set up parallel junit tests in Ant, manage the separate code coverage files and then merge the result. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58009] Trying to forward request to newly created file results in 404 "The requested resource is not available."
https://bz.apache.org/bugzilla/show_bug.cgi?id=58009 --- Comment #5 from Christopher Schultz --- One more option: write a new servlet to serve your new files off the filesystem instead of relying on DefaultServlet to do it for you. While this strategy will work, it's easy to do it wrong, or fail to implement nice features like Range requests, ETag/IfModifiedSince/etc. -- 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 57938] HttpServletRequest.getParts causes NPE when allowCasualMultipartParsing set "true" and multipart field is empty
https://bz.apache.org/bugzilla/show_bug.cgi?id=57938 --- Comment #3 from Christopher Schultz --- (In reply to Mark Thomas from comment #2) > maxPostSize=0 was really a bug in how allowCasualMultipartParsing was > implemented but I opted to switch the meaning if zero to a limit of zero > since a) it is more intuitive and b) it aligns with maxSavePostSize. I'm interested (since I wrote it), what was the "real" bug? -- 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 58031] Posting data exceeding maxPostSize should result in HTTP 413.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 --- Comment #1 from Christopher Schultz --- I'm iffy on this patch because it's not configurable (I'd like to point out that the current behavior is also not configurable, and this definitely is an improvement). The application itself might want to check this situation and react differently, like it can when there are too many request parameters. You should check out the FailedRequestFilter to see what happens in that case: http://tomcat.apache.org/tomcat-8.0-doc/config/filter.html#Failed_Request_Filter It does almost what you want, except that it returns a 400 response instead of 413, and only currently works for violations of maxParameterCount. Look into how Globals.PARAMETER_PARSE_FAILED_ATTR is used to communicate this situation to the application and see if you can come up with something that might work better than your current proposal. -- 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: Multi-threaded unit tests
Mark, On 6/15/15 8:02 AM, Mark Thomas wrote: > I have been experimenting with the free Azure credits that come with the > MSDN subscription Microsoft kindly offers to all Apache committers to > use for their ASF work. > > I have been looking at options for making the unit tests run faster. > > All the figures below are for running the trunk unit tests on a fully > updated Ubuntu 14.04 LTS instance. > > > A2 Basic 233:53 tests on hdd, with code coverage, 1 thread > D2 120:57 tests on hdd, with code coverage, 1 thread > D2 119:53 tests on ssd, with code coverage, 1 thread > D232:16 tests on hdd, no code coverage, 2 threads > D223:24 tests on hdd, no code coverage, 4 threads > > (Both A2 and D2 boxes have 2 cores. D2 have 60% faster processors). > > I'll be testing larger instance with more cores later. > > So far, I think it is safe to draw the following conclusions: > - code coverage is expensive > - code coverage (as currently configured) requires single thread > execution (more on this below) > - 1 test thread per core definitely gives better performance > - 2 test threads per core gives even better performance Obviously, code coverage and CPU power (more likely access to the CPU, not the CPU speed itself) are bigger factors in the equation, here. Multi-threaded is nice, but it's marginal compared to the other factors (which are orders of magnitude at this point). One more data point would have been good to have: D2???:?? tests on hdd, no code coverage, 1 thread > Where the limit is for threads per core is TBD. > > I've already fixed the unit tests (I think) so parallel running is > possible. I'll be adding a threads option to build.xml shortly. It will > default to 1 and I'll add a comment to build.properties.default not to > increase it above 1 if code coverage is enabled (I might try and detect > and handle that case). Once I have data on threads vs cores I'll add > that too. > > The reason code coverage doesn't work with the junit threads option is > that cobertura serialises the coverage data between tests. If we > partitioned the tests (e.g. by name) and configured separated coverage > data files for each partition (merging them at the end) then cobertura > would be OK. Sensibly partitioning the tests is more effort than I have > time for at the moment so I am going with the simple option. If doubling the number of threads delivers a ~30% performance improvement in the code coverage (just extrapolating the results for merely running the tests over to code-coverage), then perhaps a heavy-handed segmentation of the Cobertura tests into two arbitrarily-selected sets of tests would be a good trial with not too much effort to give it a try. What do you think? -chris signature.asc Description: OpenPGP digital signature
[Bug 58023] Memory Leak in WebappClassLoader
https://bz.apache.org/bugzilla/show_bug.cgi?id=58023 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- Thanks for the report. Strictly I would class this as excessive memory usage rather than a leak since a) there is an upper limit to the memory that will be used and b) the memory will be recovered once the application has been undeployed. Regardless of how it is classified, it is a bug. I have applied an alternative fix (only request and retain the manifest while loading a class and then drop it) that should achieve the same ends for trunk (9.0.x), 8.0.x (for 8.0.24 onwards) and 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: r1685893 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt Date: Tue Jun 16 19:22:58 2015 New Revision: 1685893 URL: http://svn.apache.org/r1685893 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58023 Fix potentially excessive memory usage due to unnecessary caching of JAR manifests. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 19:22:58 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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,
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/297 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] 1685892 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
Re: removing empty stubs in tc-native trunk
Jean-Frederic, On 6/15/15 7:27 AM, jean-frederic clere wrote: > We have empty stubs in tc-native when openssl isn't detected, are those > still needed? > > With NIO and NIO2 connectors we don't need native when we aren't using SSL. > > Comments? Having #ifdef'd some of those stubs myself, the idea was to make it so you wouldn't crash the JVM if you called a native method from the Java side of things. Those stubs are (obviously) no-ops but can protect the user from bringing-down the server if they try to e.g. enable SSL with OpenSSL was not built-in. I would recommend leaving them in, though it might be cleaner to do it in another way (I'm not sure how, though). -chris signature.asc Description: OpenPGP digital signature
Re: porting netty-tcnative to tomcat-native
Rémy, On 6/15/15 5:10 AM, Rémy Maucherat wrote: > 2015-06-15 10:42 GMT+02:00 Mark Thomas : > >>> It seems they are used in etPeerCertChain() and getCiphers() only, if >>> someone uses client certificates than might make sense. >> >> Those will get called more than once so no objection to caching those >> classes here. >> >> No prooblem with adding that "cahching" but I don't think it will make a > real performance difference. Every little bit helps :) But if it makes the code hard to read, awkward, or otherwise more difficult to maintain, we should get rid of it. Right now, it doesn't look too bad. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1685892 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/changelog.xml
Author: markt Date: Tue Jun 16 19:16:00 2015 New Revision: 1685892 URL: http://svn.apache.org/r1685892 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58023 Fix potentially excessive memory usage due to unnecessary caching of JAR manifests. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 19:16:00 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 +/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
Re: svn commit: r1685253 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Konstantin, On 6/13/15 9:38 AM, kkoli...@apache.org wrote: > Author: kkolinko > Date: Sat Jun 13 13:38:52 2015 > New Revision: 1685253 > > URL: http://svn.apache.org/r1685253 > Log: > Mention configuration attribute name for BZ 55988 > > Modified: > tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > > Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1685253&r1=1685252&r2=1685253&view=diff > == > --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Jun 13 13:38:52 2015 > @@ -518,7 +518,9 @@ > > > 55988: Add support for Java 8 JSSE server-preferred TLS > -cipher suite ordering. This feature requires Java 8. > +cipher suite ordering. This feature requires Java 8 > +and is controlled by useServerCipherSuitesOrder > +attribute on an HTTP connector. > Based upon a patch provided by Ognjen Blagojevic. (schultz) > > Thanks for this. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1685891 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Author: markt
Date: Tue Jun 16 19:13:38 2015
New Revision: 1685891
URL: http://svn.apache.org/r1685891
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58023
Fix potentially excessive memory usage due to unnecessary caching of JAR
manifests.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1685891&r1=1685890&r2=1685891&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue
Jun 16 19:13:38 2015
@@ -153,15 +153,17 @@ public abstract class WebappClassLoaderB
protected final String name;
protected final String path;
+protected final boolean manifestRequired;
-PrivilegedFindResourceByName(String name, String path) {
+PrivilegedFindResourceByName(String name, String path, boolean
manifestRequired) {
this.name = name;
this.path = path;
+this.manifestRequired = manifestRequired;
}
@Override
public ResourceEntry run() {
-return findResourceInternal(name, path);
+return findResourceInternal(name, path, manifestRequired);
}
}
@@ -930,10 +932,10 @@ public abstract class WebappClassLoaderB
if (entry == null) {
if (securityManager != null) {
PrivilegedAction dp =
-new PrivilegedFindResourceByName(name, path);
+new PrivilegedFindResourceByName(name, path, false);
entry = AccessController.doPrivileged(dp);
} else {
-entry = findResourceInternal(name, path);
+entry = findResourceInternal(name, path, false);
}
}
if (entry != null) {
@@ -2403,10 +2405,10 @@ public abstract class WebappClassLoaderB
if (securityManager != null) {
PrivilegedAction dp =
-new PrivilegedFindResourceByName(name, path);
+new PrivilegedFindResourceByName(name, path, true);
entry = AccessController.doPrivileged(dp);
} else {
-entry = findResourceInternal(name, path);
+entry = findResourceInternal(name, path, true);
}
if (entry == null) {
@@ -2526,7 +2528,8 @@ public abstract class WebappClassLoaderB
*
* @return the loaded resource, or null if the resource isn't found
*/
-protected ResourceEntry findResourceInternal(final String name, final
String path) {
+protected ResourceEntry findResourceInternal(final String name, final
String path,
+boolean manifestRequired) {
checkStateForResourceLoading(name);
@@ -2600,7 +2603,10 @@ public abstract class WebappClassLoaderB
entry.certificates = resource.getCertificates();
}
}
-entry.manifest = resource.getManifest();
+
+if (manifestRequired) {
+entry.manifest = resource.getManifest();
+}
if (isClassResource && entry.binaryContent != null &&
this.transformers.size() > 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: SVN checkout errors
And now it's working. Not sure what was wrong but thanks for your help. On 16 June 2015 at 09:52, Mark Thomas wrote: > On 16/06/2015 16:33, Kevin Hale Boyes wrote: > > I'm trying to check out trunk but am getting errors. > > > > $ svn co http://svn.apache.org/repos/asf/tomcat/trunk tomcat-trunk > > svn: E175002: Unable to connect to a repository at URL ' > > http://svn.apache.org/repos/asf/tomcat/trunk' > > svn: E175002: Server sent unexpected return value (500 Internal Server > > Error) in response to OPTIONS request for ' > > http://svn.apache.org/repos/asf/tomcat/trunk' > > > > but > > > > $ svn co http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk > tomcat8.0.x > > > > was successful. > > > > > > Am I doing something wrong? > > Nope. If you can check out 8.0.x/trunk you should be able to check out > trunk. It is all one big repo and the permissions are at the /tomcat level. > > Mark > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: SVN checkout errors
On 16/06/2015 16:33, Kevin Hale Boyes wrote: > I'm trying to check out trunk but am getting errors. > > $ svn co http://svn.apache.org/repos/asf/tomcat/trunk tomcat-trunk > svn: E175002: Unable to connect to a repository at URL ' > http://svn.apache.org/repos/asf/tomcat/trunk' > svn: E175002: Server sent unexpected return value (500 Internal Server > Error) in response to OPTIONS request for ' > http://svn.apache.org/repos/asf/tomcat/trunk' > > but > > $ svn co http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk tomcat8.0.x > > was successful. > > > Am I doing something wrong? Nope. If you can check out 8.0.x/trunk you should be able to check out trunk. It is all one big repo and the permissions are at the /tomcat level. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58042] SlowQueryReport failed query logging
https://bz.apache.org/bugzilla/show_bug.cgi?id=58042 Mark Thomas changed: What|Removed |Added Component|Catalina|jdbc-pool OS||All Version|trunk |unspecified Product|Tomcat 8|Tomcat Modules Target Milestone||--- --- Comment #1 from Mark Thomas --- Correct component -- 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 checkout errors
I'm trying to check out trunk but am getting errors. $ svn co http://svn.apache.org/repos/asf/tomcat/trunk tomcat-trunk svn: E175002: Unable to connect to a repository at URL ' http://svn.apache.org/repos/asf/tomcat/trunk' svn: E175002: Server sent unexpected return value (500 Internal Server Error) in response to OPTIONS request for ' http://svn.apache.org/repos/asf/tomcat/trunk' but $ svn co http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk tomcat8.0.x was successful. Am I doing something wrong? Thanks, Kevin.
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/295 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] 1685774 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
[Bug 58042] New: SlowQueryReport failed query logging
https://bz.apache.org/bugzilla/show_bug.cgi?id=58042 Bug ID: 58042 Summary: SlowQueryReport failed query logging Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: kwill...@gmail.com The SlowQueryReport JDBC interceptor catches Exceptions, by default logs them, and rethrows them. There is an option with the latest version not to write the message to the log, but it still sends it to JMX. It is very common in enterprise frameworks (such as Spring JDBC) to call a method, catch any exception thrown and handle the exception. All of this is normal activity. It should not be logged, it should not be sent to JMX. So first I would argue that SlowQueryReport SHOULD NOT log failed SQL statements at all. It is not documented as such, and it is a pain in the ??? that it does. :-) Second, it you will not remove the functionality, please understand that JMX and logging should "log" the same actions. So the setting should effect both. But again, if you want to make it hard to configure, by all means create yet another setting to control sending failed SQL to JMX. Finally, if you will not remove the functionality, please change the default to NOT log failed SQL. Minimal configuration is best. :-) -- 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-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/682 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] 1685829 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
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/1392 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] 1685826 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 58010] Class file are not getting compiled with debuginfo while setting classdebuginfo in jasper ant task
https://bz.apache.org/bugzilla/show_bug.cgi?id=58010 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WORKSFORME --- Comment #6 from Mark Thomas --- I've just tested this locally using the latest 7.0.x code (not that that should matter - I don;t recall any changes in this area for years) and it works as expected. Please follow up on the users mailing list if you require further assistance. If you are able to recreate this issue then feel free to re-open it and provide the exact steps necessary to reproduce it from a clean install of the latest 7.0.x release. -- 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 58009] Trying to forward request to newly created file results in 404 "The requested resource is not available."
https://bz.apache.org/bugzilla/show_bug.cgi?id=58009 Mark Thomas changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEEDINFO|RESOLVED --- Comment #4 from Mark Thomas --- No test case has been provided. Further, the WebResourceRoot already contains methods for adding resources that correctly interacts with caching if caching is enabled. It is used, for example, with HTTP PUT. The Servlet API provides no standard mechanisms for writing new resources (it doesn't even assume that the web application is served from a file system) so you are always going to have to work wth some form of container specific interface. In Tomcat the options are: - disable caching - don't try to access the file before you try to write to it - use WebResourceRoot.write(String, InputStream, boolean) -- 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/1391 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] 1685772 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
[Bug 57971] Description of recoverySleepTime doesn't correspond with the implementation
https://bz.apache.org/bugzilla/show_bug.cgi?id=57971 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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 57971] Description of recoverySleepTime doesn't correspond with the implementation
https://bz.apache.org/bugzilla/show_bug.cgi?id=57971 --- Comment #1 from Mark Thomas --- Thanks for the bug report and the patch. I applied a modified version (that corrected the remaining langauge) to trunk (for 9.0.x), 8.0.x (for 8.0.24 onwards), 7.0.x (for 7.0.63 onwards) and 6.0.x (for 6.0.45 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: r1685833 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jun 16 13:35:56 2015 New Revision: 1685833 URL: http://svn.apache.org/r1685833 Log: Correct location Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1685833&r1=1685832&r2=1685833&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 16 13:35:56 2015 @@ -44,6 +44,14 @@ General, Catalina, Coyote, Jasper, Cluster, Web applications, Other --> + + + +57971: Correct the documentation for the cluster +configuration setting recoverySleepTime. (markt) + + + @@ -183,10 +191,6 @@ clearer that hex values are not valid for cluster send options. Based on a patch by Kyohei Nakamura. (markt) - -57971: Correct the documentation for the cluster -configuration setting recoverySleepTime. (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1685832 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/cluster-membership.xml
Author: markt Date: Tue Jun 16 13:31:32 2015 New Revision: 1685832 URL: http://svn.apache.org/r1685832 Log: Correct the documentation for the cluster configuration setting recoverySleepTime Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 13:31:32 2015 @@ -1,3 +1,3 @@ -/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541 ,1668635,1669802,1681183 -/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1681182 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770 809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265 ,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95 0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-
svn commit: r1685829 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/cluster-membership.xml
Author: markt Date: Tue Jun 16 13:29:26 2015 New Revision: 1685829 URL: http://svn.apache.org/r1685829 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57971 Correct the documentation for the cluster configuration setting recoverySleepTime Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-membership.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 13:29:26 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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,135012
svn commit: r1685827 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/cluster-membership.xml
Author: markt Date: Tue Jun 16 13:28:33 2015 New Revision: 1685827 URL: http://svn.apache.org/r1685827 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57971 Correct the documentation for the cluster configuration setting recoverySleepTime Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-membership.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 13:28:33 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 +/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,16
svn commit: r1685826 - /tomcat/trunk/webapps/docs/config/cluster-membership.xml
Author: markt Date: Tue Jun 16 13:18:55 2015 New Revision: 1685826 URL: http://svn.apache.org/r1685826 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57971 Fix docs for recoverySleepTime. Based on a patch by Tatsuya Bessho. Modified: tomcat/trunk/webapps/docs/config/cluster-membership.xml Modified: tomcat/trunk/webapps/docs/config/cluster-membership.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-membership.xml?rev=1685826&r1=1685825&r2=1685826&view=diff == --- tomcat/trunk/webapps/docs/config/cluster-membership.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster-membership.xml Tue Jun 16 13:18:55 2015 @@ -146,8 +146,7 @@ When recoveryEnabled==true this value indicates how long time (in milliseconds) - the system will sleep in between recovery attempts, until we either recovered successfully or we have reached the - recoveryCounter limit. + the system will sleep in between recovery attempts, until it recovers successfully. The default is 5000 (5 seconds). - 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-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/294 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] 1685759 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
[Bug 57944] Set writeListener to servletoutputstream outside the container thread not working
https://bz.apache.org/bugzilla/show_bug.cgi?id=57944 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED OS||All Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. This has been fixed in trunk (for 9.0.x) and in 8.0.x (for 8.0.24 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: r1685819 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/InputBuffer.java java/org/apache/coyote/Response.java test/org/apache/catalina/connector/TestCoyoteOutputStream.j
Author: markt Date: Tue Jun 16 13:07:23 2015 New Revision: 1685819 URL: http://svn.apache.org/r1685819 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57944 Ensure that if either or both of the non-blocking listeners are set on non-container threads that the appropriate events are triggered. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/Response.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 13:07:23 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 +/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-1640
svn commit: r1685816 - in /tomcat/trunk: java/org/apache/catalina/connector/InputBuffer.java java/org/apache/coyote/Response.java test/org/apache/catalina/connector/TestCoyoteOutputStream.java
Author: markt
Date: Tue Jun 16 13:04:11 2015
New Revision: 1685816
URL: http://svn.apache.org/r1685816
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57944
Ensure that if either or both of the non-blocking listeners are set on
non-container threads that the appropriate events are triggered.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1685816&r1=1685815&r2=1685816&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Tue Jun 16
13:04:11 2015
@@ -260,6 +260,10 @@ public class InputBuffer extends Reader
// is not required.
if (!coyoteRequest.isFinished() && isReady()) {
coyoteRequest.action(ActionCode.DISPATCH_READ, null);
+if (!ContainerThreadMarker.isContainerThread()) {
+// Not on a container thread so need to execute the dispatch
+coyoteRequest.action(ActionCode.DISPATCH_EXECUTE, null);
+}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1685816&r1=1685815&r2=1685816&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Tue Jun 16 13:04:11 2015
@@ -581,7 +581,6 @@ public final class Response {
// the container will call listener.onWritePossible() once data can be
// written.
if (isReady()) {
-action(ActionCode.DISPATCH_WRITE, null);
synchronized (nonBlockingStateLock) {
// Ensure we don't get multiple write registrations if
// ServletOutputStream.isReady() returns false during a call to
@@ -592,6 +591,11 @@ public final class Response {
// happen
fireListener = true;
}
+action(ActionCode.DISPATCH_WRITE, null);
+if (!ContainerThreadMarker.isContainerThread()) {
+// Not on a container thread so need to execute the dispatch
+action(ActionCode.DISPATCH_EXECUTE, null);
+}
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java?rev=1685816&r1=1685815&r2=1685816&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
Tue Jun 16 13:04:11 2015
@@ -40,43 +40,73 @@ import org.apache.tomcat.util.buf.ByteCh
public class TestCoyoteOutputStream extends TomcatBaseTest {
@Test
-public void testNonBlockingWriteNoneBlockingWriteNone() throws Exception {
-doNonBlockingTest(0, 0);
+public void testNonBlockingWriteNoneBlockingWriteNoneContainerThread()
throws Exception {
+doNonBlockingTest(0, 0, true);
}
@Test
-public void testNonBlockingWriteOnceBlockingWriteNone() throws Exception {
-doNonBlockingTest(1, 0);
+public void testNonBlockingWriteOnceBlockingWriteNoneContainerThread()
throws Exception {
+doNonBlockingTest(1, 0, true);
}
@Test
-public void testNonBlockingWriteTwiceBlockingWriteNone() throws Exception {
-doNonBlockingTest(2, 0);
+public void testNonBlockingWriteTwiceBlockingWriteNoneContainerThread()
throws Exception {
+doNonBlockingTest(2, 0, true);
}
@Test
-public void testNonBlockingWriteNoneBlockingWriteOnce() throws Exception {
-doNonBlockingTest(0, 1);
+public void testNonBlockingWriteNoneBlockingWriteOnceContainerThread()
throws Exception {
+doNonBlockingTest(0, 1, true);
}
@Test
-public void testNonBlockingWriteOnceBlockingWriteOnce() throws Exception {
-doNonBlockingTest(1, 1);
+public void testNonBlockingWriteOnceBlockingWriteOnceContainerThread()
throws Exception {
+doNonBlockingTest(1, 1, true);
}
@Test
-public void testNonBlockingWriteTwiceBlockingWriteOnce() throws Exception {
-doNonBlockingTest(2, 1);
+public void testNonBlockingWriteTwiceBlockingWriteOnceContainerThread()
throws Exception {
+doNonBlockingTest(2, 1, true);
}
-p
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/681 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] 1685762 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: r1685775 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/TestRequest.java
Author: markt Date: Tue Jun 16 11:51:54 2015 New Revision: 1685775 URL: http://svn.apache.org/r1685775 Log: Fix test broken by fix for BZ57938 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 11:51:54 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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,13
svn commit: r1685774 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/connector/TestRequest.java
Author: markt Date: Tue Jun 16 11:51:18 2015 New Revision: 1685774 URL: http://svn.apache.org/r1685774 Log: Fix test broken by fix for BZ57938 Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 11:51:18 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 +/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,164312
svn commit: r1685772 - /tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
Author: markt Date: Tue Jun 16 11:50:43 2015 New Revision: 1685772 URL: http://svn.apache.org/r1685772 Log: Fix test broken by fix for BZ57938 Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1685772&r1=1685771&r2=1685772&view=diff == --- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original) +++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Tue Jun 16 11:50:43 2015 @@ -84,8 +84,7 @@ public class TestRequest extends TomcatB assertTrue(client.isResponseBodyOK()); client.reset(); client.doRequest(0, false); // 0 bytes - too small should fail -assertTrue(client.isResponse200()); -assertTrue(client.isResponseBodyOK()); +assertTrue(client.isResponse400()); client.reset(); client.doRequest(1, false); // 1 byte - too small should fail assertTrue(client.isResponse400()); - 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/1390 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] 1685744 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
[Bug 57938] HttpServletRequest.getParts causes NPE when allowCasualMultipartParsing set "true" and multipart field is empty
https://bz.apache.org/bugzilla/show_bug.cgi?id=57938 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Thanks for the report. These issues have been fixed in trunk (9.0.x), 8.0.x (for 8.0.24 onwards) and 7.0.x (for 7.0.63 onwards). I opted for a slightly different fix for the first issue. Negative values are now converted to 0 in the MultipartConfigElement constructor. maxPostSize=0 was really a bug in how allowCasualMultipartParsing was implemented but I opted to switch the meaning if zero to a limit of zero since a) it is more intuitive and b) it aligns with maxSavePostSize. -- 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: r1685762 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/ java/org/apache/catalina/connector/ test/org/apache/catalina/connector/ webapps/docs/ webapps/docs/config/
Author: markt Date: Tue Jun 16 11:13:04 2015 New Revision: 1685762 URL: http://svn.apache.org/r1685762 Log: Correctly handle empty fields when: - Connector.maxPostSize="-1" - Context.allowCasualMultipartParsing="true" Change the meaning of maxPostSize="0" from unlimited to not allowed since: - this is consistent with maxSavePostSize - this is more intuitive - Tomcat already behaved this way in some circumstances Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/javax/servlet/MultipartConfigElement.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 11:13:04 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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,
svn commit: r1685761 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt Date: Tue Jun 16 11:11:28 2015 New Revision: 1685761 URL: http://svn.apache.org/r1685761 Log: Fix nag Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1685761&r1=1685760&r2=1685761&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Tue Jun 16 11:11:28 2015 @@ -49,6 +49,7 @@ import javax.websocket.server.ServerEndp import org.junit.Assert; import org.junit.Assume; import org.junit.Test; + import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1685759 - in /tomcat/tc8.0.x/trunk: ./ java/javax/servlet/ java/org/apache/catalina/connector/ test/org/apache/catalina/connector/ webapps/docs/ webapps/docs/config/
Author: markt Date: Tue Jun 16 11:07:42 2015 New Revision: 1685759 URL: http://svn.apache.org/r1685759 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57938 Correctly handle empty fields when: - Connector.maxPostSize="-1" - Context.allowCasualMultipartParsing="true" Change the meaning of maxPostSize="0" from unlimited to not allowed since: - this is consistent with maxSavePostSize - this is more intuitive - Tomcat already behaved this way in some circumstances Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/javax/servlet/MultipartConfigElement.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 11:07:42 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,16
svn commit: r1685744 - in /tomcat/trunk: java/org/apache/catalina/connector/Request.java test/org/apache/catalina/connector/TestRequest.java webapps/docs/config/ajp.xml webapps/docs/config/http.xml
Author: markt
Date: Tue Jun 16 09:24:52 2015
New Revision: 1685744
URL: http://svn.apache.org/r1685744
Log:
Remainder of fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57938
Change the meaning of maxPostSize="0" from unlimited to not allowed since:
- this is consistent with maxSavePostSize
- this is more intuitive
- Tomcat already behaved this way in some circumstances
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
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=1685744&r1=1685743&r2=1685744&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Jun 16
09:24:52 2015
@@ -2696,7 +2696,7 @@ public class Request
// Should not be possible
}
}
-if (maxPostSize > 0) {
+if (maxPostSize >= 0) {
// Have to calculate equivalent size. Not
completely
// accurate but close enough.
if (charset == null) {
@@ -3008,7 +3008,7 @@ public class Request
if (len > 0) {
int maxPostSize = connector.getMaxPostSize();
-if ((maxPostSize > 0) && (len > maxPostSize)) {
+if ((maxPostSize >= 0) && (len > maxPostSize)) {
Context context = getContext();
if (context != null &&
context.getLogger().isDebugEnabled()) {
context.getLogger().debug(
@@ -3100,7 +3100,7 @@ public class Request
int len = 0;
while (len > -1) {
len = getStream().read(buffer, 0, CACHED_POST_LEN);
-if (connector.getMaxPostSize() > 0 &&
+if (connector.getMaxPostSize() >= 0 &&
(body.getLength() + len) > connector.getMaxPostSize()) {
// Too much data
checkSwallowInput();
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1685744&r1=1685743&r2=1685744&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Tue Jun 16
09:24:52 2015
@@ -83,7 +83,7 @@ public class TestRequest extends TomcatB
assertTrue(client.isResponse200());
assertTrue(client.isResponseBodyOK());
client.reset();
-client.doRequest(0, false); // Unlimited
+client.doRequest(0, false); // 0 bytes - too small should fail
assertTrue(client.isResponse200());
assertTrue(client.isResponseBodyOK());
client.reset();
Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1685744&r1=1685743&r2=1685744&view=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Tue Jun 16 09:24:52 2015
@@ -113,7 +113,7 @@
The maximum size in bytes of the POST which will be handled by
the container FORM URL parameter parsing. The limit can be disabled by
- setting this attribute to a value less than or equal to 0.
+ setting this attribute to a value less than zero.
If not specified, this attribute is set to 2097152 (2 megabytes).
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1685744&r1=1685743&r2=1685744&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Jun 16 09:24:52 2015
@@ -122,7 +122,7 @@
The maximum size in bytes of the POST which will be handled by
the container FORM URL parameter parsing. The limit can be disabled by
- setting this attribute to a value less than or equal to 0.
+ setting this attribute to a value less than zero.
If not specified, this attribute is set to 2097152 (2 megabytes).
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1685739 - /tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
Author: markt
Date: Tue Jun 16 09:06:24 2015
New Revision: 1685739
URL: http://svn.apache.org/r1685739
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57938
Correctly handle empty fields when:
- Connector.maxPostSize="-1"
- Context.allowCasualMultipartParsing="true"
Modified:
tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
Modified: tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/MultipartConfigElement.java?rev=1685739&r1=1685738&r2=1685739&view=diff
==
--- tomcat/trunk/java/javax/servlet/MultipartConfigElement.java (original)
+++ tomcat/trunk/java/javax/servlet/MultipartConfigElement.java Tue Jun 16
09:06:24 2015
@@ -51,7 +51,13 @@ public class MultipartConfigElement {
}
this.maxFileSize = maxFileSize;
this.maxRequestSize = maxRequestSize;
-this.fileSizeThreshold = fileSizeThreshold;
+// Avoid threshold values of less than zero as they cause trigger NPEs
+// in the Commons FileUpload port for fields that have no data.
+if (fileSizeThreshold > 0) {
+this.fileSizeThreshold = fileSizeThreshold;
+} else {
+this.fileSizeThreshold = 0;
+}
}
public MultipartConfigElement(MultipartConfig annotation) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57530] Reimplement TestAbstractHttp11Processor.testNon2xxResponseWithExpectation test using SimpleHttpClient instead of Java 6
https://bz.apache.org/bugzilla/show_bug.cgi?id=57530 --- Comment #6 from Violeta Georgieva --- I'm going to reimplement the TestAbstractHttp11Processor.testNon2xxResponseWithExpectation with SimpleHttpClient. Regards, 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 57906] Message about failure to load ApplicationContextFacadeBeanInfo class when running with SecurityManager enabled
https://bz.apache.org/bugzilla/show_bug.cgi?id=57906 --- Comment #2 from Mark Thomas --- Given that: - this is a purely cosmetic issue - the root cause appears to be in the JRE since it only appears when running with Java 6 - public updates for Orace's Java 6 ceased in Feb 2013 - it only occurs when running under a security manager I'm am leaning towards resolving this as WONTFIX. Users still running Java 6 who want a fix for this issue can either update to Java 7 or request a Java 6 fix from their JVM vendor. -- 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: r1685726 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jun 16 07:40:30 2015 New Revision: 1685726 URL: http://svn.apache.org/r1685726 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=1685726&r1=1685725&r2=1685726&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 16 07:40:30 2015 @@ -71,7 +71,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/r1675821 (fix) http://svn.apache.org/r1678180 (documentation) - +1: kkolinko + +1: kkolinko, markt -1: * Remove obsolete code supporting old tcnative <= 1.1.20. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 --- Comment #13 from Mark Thomas --- Any update now 8.0.23 is released? Still waiting on a test case or steps to reproduce. -- 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 56931] VirtualDirContext requires an absolute DocBase
https://bz.apache.org/bugzilla/show_bug.cgi?id=56931 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas --- Based on the fact that the steps to reproduce contain no information on how to configure the VirtualDirContext, this does not appear to have anything to do with the VirtualDirContext. This looks to be a configuration error. See the allowLinking of the Context element: http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Standard_Implementation -- 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
