[VOTE][RESULT] Release Apache Tomcat 9.0.5
The following votes were cast: Binding +1 (stable): remm, markt, violetagg, fschumacher, kfujino, csutherl No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark On 06/02/18 22:08, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.5 release is now available for voting. > > The major changes compared to the 9.0.4 release are: > > - Refactor error handling to enable errors that occur before processing > is passed to the application to be handled by the application provided > error handling and/or the container provided error handling > (ErrorReportValve) as appropriate. > > - Enable strict validation of the provided host name and port for all > connectors. Requests with invalid host names and/or ports will be > rejected with a 400 response. > > - Enhance the JMX support for jdbc-pool in order to expose > PooledConnection and JdbcInterceptors. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.5/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1170/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_5/ > > The proposed 9.0.5 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 9.0.5 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 8.5.28
The following votes were cast: Binding: +1 (stable): huxing, remm, violetagg, markt, schultz, fschumacher, kfujino, csutherl No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark On 06/02/18 23:33, Mark Thomas wrote: > The proposed Apache Tomcat 8.5.28 release is now available for voting. > > The major changes compared to the 8.5.27 release are: > > - Fix truncated request input streams when using NIO2 with TLS. > > - Improved error handling and reporting for TLS configuration. > > - Enhance the JMX support for jdbc-pool in order to expose > PooledConnection and JdbcInterceptors. > > Along with lots of other bug fixes and improvements. > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.28/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1171/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_28/ > > The proposed 8.5.28 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.5.28 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r24937 - /dev/tomcat/tomcat-9/v9.0.5/ /release/tomcat/tomcat-9/v9.0.5/
Author: markt Date: Sun Feb 11 20:11:23 2018 New Revision: 24937 Log: Release Apache Tomcat 9.0.5 Added: release/tomcat/tomcat-9/v9.0.5/ - copied from r24936, dev/tomcat/tomcat-9/v9.0.5/ Removed: dev/tomcat/tomcat-9/v9.0.5/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r24938 - /dev/tomcat/tomcat-8/v8.5.28/ /release/tomcat/tomcat-8/v8.5.28/
Author: markt Date: Sun Feb 11 20:11:50 2018 New Revision: 24938 Log: Release Apache Tomcat 8.5.28 Added: release/tomcat/tomcat-8/v8.5.28/ - copied from r24937, dev/tomcat/tomcat-8/v8.5.28/ Removed: dev/tomcat/tomcat-8/v8.5.28/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1823888 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Sun Feb 11 20:12:53 2018 New Revision: 1823888 URL: http://svn.apache.org/viewvc?rev=1823888&view=rev Log: Add release date for 9.0.5 Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1823888&r1=1823887&r2=1823888&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sun Feb 11 20:12:53 2018 @@ -76,7 +76,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1823889 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Sun Feb 11 20:13:45 2018 New Revision: 1823889 URL: http://svn.apache.org/viewvc?rev=1823889&view=rev Log: Add release date for 8.5.28 Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1823889&r1=1823888&r2=1823889&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Sun Feb 11 20:13:45 2018 @@ -68,7 +68,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Git migration] CI systems
On 05/02/18 10:23, Mark Thomas wrote: > We'll need to update the CI systems (Gump, BuildBot) to work off git > rather than svn. Both support this so this should be fairly simple. > > My proposed plan is that we leave the CI systems pointing at svn to > start with, migrate to a single git repo as discussed previously (steps > on the wiki page) and, once we are happy with that repo, then switch > over the CI systems. > > Thoughts? Comments? No feedback so the above approach is the plan I'll update the wiki with. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Git migration] How to handle svn:external used by Tomcat Native
Currently, Tomcat Native uses an svn:external to pull in the current Java source from trunk. With the switch to git, we'll need a different solution. Possible options: 1) Stop distributing Java elements of Tomcat Native in the Tomcat Native release 2) Migrate Tomcat Native to git and use a sub-module One point to note with option 2 is that, as far as I have been able to determine so far, you can't add a sub-directory of another git repo as a sub-module. It has to be the whole thing. That isn't really what we want. Thoughts? comments? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1823896 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2AsyncParser.java Http2Parser.java
Author: remm
Date: Sun Feb 11 20:57:37 2018
New Revision: 1823896
URL: http://svn.apache.org/viewvc?rev=1823896&view=rev
Log:
Add a flag for header parsing, and other cosmetic changes to trigger a build
(TestHttp2Section_6_8 may be an intermittent failure on CI, although it works
for me locally).
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java?rev=1823896&r1=1823895&r2=1823896&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java Sun Feb 11
20:57:37 2018
@@ -30,8 +30,8 @@ import org.apache.tomcat.util.net.Socket
class Http2AsyncParser extends Http2Parser {
-protected final SocketWrapperBase socketWrapper;
-protected final Http2AsyncUpgradeHandler upgradeHandler;
+private final SocketWrapperBase socketWrapper;
+private final Http2AsyncUpgradeHandler upgradeHandler;
private Throwable error = null;
Http2AsyncParser(String connectionId, Input input, Output output,
SocketWrapperBase socketWrapper, Http2AsyncUpgradeHandler upgradeHandler) {
@@ -79,7 +79,7 @@ class Http2AsyncParser extends Http2Pars
}
}
-protected void unRead(ByteBuffer buffer) {
+private void unRead(ByteBuffer buffer) {
if (buffer != null && buffer.hasRemaining()) {
socketWrapper.unRead(buffer);
}
@@ -118,25 +118,31 @@ class Http2AsyncParser extends Http2Pars
}
-protected class FrameCompletionCheck implements CompletionCheck {
-final FrameCompletionHandler handler;
-boolean validated = false;
-protected FrameCompletionCheck(FrameCompletionHandler handler) {
+private class FrameCompletionCheck implements CompletionCheck {
+
+private final FrameCompletionHandler handler;
+private boolean parsedFrameHeader = false;
+private boolean validated = false;
+
+private FrameCompletionCheck(FrameCompletionHandler handler) {
this.handler = handler;
}
+
@Override
public CompletionHandlerCall callHandler(CompletionState state,
ByteBuffer[] buffers, int offset, int length) {
-// The first buffer should be 9 bytes long
-ByteBuffer frameHeaderBuffer = buffers[offset];
-if (frameHeaderBuffer.position() < 9) {
-return CompletionHandlerCall.CONTINUE;
+if (!parsedFrameHeader) {
+// The first buffer should be 9 bytes long
+ByteBuffer frameHeaderBuffer = buffers[offset];
+if (frameHeaderBuffer.position() < 9) {
+return CompletionHandlerCall.CONTINUE;
+}
+parsedFrameHeader = true;
+handler.payloadSize =
ByteUtil.getThreeBytes(frameHeaderBuffer, 0);
+handler.frameType =
FrameType.valueOf(ByteUtil.getOneByte(frameHeaderBuffer, 3));
+handler.flags = ByteUtil.getOneByte(frameHeaderBuffer, 4);
+handler.streamId = ByteUtil.get31Bits(frameHeaderBuffer, 5);
}
-
-handler.payloadSize = ByteUtil.getThreeBytes(frameHeaderBuffer, 0);
-handler.frameType =
FrameType.valueOf(ByteUtil.getOneByte(frameHeaderBuffer, 3));
-handler.flags = ByteUtil.getOneByte(frameHeaderBuffer, 4);
-handler.streamId = ByteUtil.get31Bits(frameHeaderBuffer, 5);
handler.state = state;
if (!validated) {
@@ -167,7 +173,8 @@ class Http2AsyncParser extends Http2Pars
}
-protected class FrameCompletionHandler implements CompletionHandler {
+private class FrameCompletionHandler implements CompletionHandler {
+
private final FrameType expected;
private final ByteBuffer[] buffers;
private int payloadSize;
@@ -177,7 +184,7 @@ class Http2AsyncParser extends Http2Pars
private boolean streamException = false;
private CompletionState state = null;
-protected FrameCompletionHandler(FrameType expected, ByteBuffer...
buffers) {
+private FrameCompletionHandler(FrameType expected, ByteBuffer...
buffers) {
this.expected = expected;
this.buffers = buffers;
}
@@ -240,6 +247,7 @@ class Http2AsyncParser extends Http2Pars
@Override
public void failed(Throwable e, Void attachment) {
+// Always a fatal IO error
error = e;
if (state == null || state == CompletionState.DONE) {
upgradeHandler.upgradeDispatch(SocketEvent.ERROR);
Modified: tomcat/trunk/java/org/apache/coyote/htt
svn commit: r1823902 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
Author: remm
Date: Sun Feb 11 21:27:03 2018
New Revision: 1823902
URL: http://svn.apache.org/viewvc?rev=1823902&view=rev
Log:
Set back constant as package.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.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=1823902&r1=1823901&r2=1823902&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Sun Feb 11
21:27:03 2018
@@ -32,7 +32,7 @@ class Http2Parser {
protected static final Log log = LogFactory.getLog(Http2Parser.class);
protected static final StringManager sm =
StringManager.getManager(Http2Parser.class);
-private static final byte[] CLIENT_PREFACE_START =
+static final byte[] CLIENT_PREFACE_START =
"PRI *
HTTP/2.0\r\n\r\nSM\r\n\r\n".getBytes(StandardCharsets.ISO_8859_1);
protected final String connectionId;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3052 Buildbot URL: https://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] 1823902 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
