[tomcat] branch master updated: Revert change as the issue seems different, despite similarities
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 284a540 Revert change as the issue seems different, despite
similarities
284a540 is described below
commit 284a540aa73824529e931751bb4815c89ae1768a
Author: remm
AuthorDate: Mon Apr 15 13:35:39 2019 +0200
Revert change as the issue seems different, despite similarities
---
java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
test/org/apache/coyote/http2/TestStream.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 967175f..f5e1986 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -580,13 +580,13 @@ class Http2Parser {
// going to be thrown.
hpackDecoder.getHeaderEmitter().validateHeaders();
+output.headersEnd(streamId);
+
if (headersEndStream) {
output.receivedEndOfStream(streamId);
headersEndStream = false;
}
-output.headersEnd(streamId);
-
// Reset size for new request if the buffer was previously expanded
if (headerReadBuffer.capacity() >
Constants.DEFAULT_HEADER_READ_BUFFER_SIZE) {
headerReadBuffer =
ByteBuffer.allocate(Constants.DEFAULT_HEADER_READ_BUFFER_SIZE);
diff --git a/test/org/apache/coyote/http2/TestStream.java
b/test/org/apache/coyote/http2/TestStream.java
index 0afaebc..2d03035 100644
--- a/test/org/apache/coyote/http2/TestStream.java
+++ b/test/org/apache/coyote/http2/TestStream.java
@@ -121,8 +121,8 @@ public class TestStream extends Http2TestBase {
"3-HeadersStart\n" +
"3-Header-[x-trailer-2]-[Trailer value two]\n" +
"3-Header-[x-trailer-1]-[Trailer value one]\n" +
-"3-EndOfStream\n" +
-"3-HeadersEnd\n", output.getTrace());
+"3-HeadersEnd\n" +
+"3-EndOfStream\n", output.getTrace());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Try swapping the headers complete processing order
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new b90393e Try swapping the headers complete processing order
b90393e is described below
commit b90393e523abfd24f620c29e30d3c13837c3ed49
Author: remm
AuthorDate: Mon Apr 15 10:57:02 2019 +0200
Try swapping the headers complete processing order
First update state as needed, then dispatch the new request, even though
it is a bit counter intuitive.
---
java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
test/org/apache/coyote/http2/TestStream.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index f5e1986..967175f 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -580,13 +580,13 @@ class Http2Parser {
// going to be thrown.
hpackDecoder.getHeaderEmitter().validateHeaders();
-output.headersEnd(streamId);
-
if (headersEndStream) {
output.receivedEndOfStream(streamId);
headersEndStream = false;
}
+output.headersEnd(streamId);
+
// Reset size for new request if the buffer was previously expanded
if (headerReadBuffer.capacity() >
Constants.DEFAULT_HEADER_READ_BUFFER_SIZE) {
headerReadBuffer =
ByteBuffer.allocate(Constants.DEFAULT_HEADER_READ_BUFFER_SIZE);
diff --git a/test/org/apache/coyote/http2/TestStream.java
b/test/org/apache/coyote/http2/TestStream.java
index 2d03035..0afaebc 100644
--- a/test/org/apache/coyote/http2/TestStream.java
+++ b/test/org/apache/coyote/http2/TestStream.java
@@ -121,8 +121,8 @@ public class TestStream extends Http2TestBase {
"3-HeadersStart\n" +
"3-Header-[x-trailer-2]-[Trailer value two]\n" +
"3-Header-[x-trailer-1]-[Trailer value one]\n" +
-"3-HeadersEnd\n" +
-"3-EndOfStream\n", output.getTrace());
+"3-EndOfStream\n" +
+"3-HeadersEnd\n", output.getTrace());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1857556 - in /tomcat/site/trunk: docs/conference.html xdocs/conference.xml
Author: jfclere Date: Mon Apr 15 10:05:18 2019 New Revision: 1857556 URL: http://svn.apache.org/viewvc?rev=1857556=rev Log: Add ApacheCon NA 2019. Modified: tomcat/site/trunk/docs/conference.html tomcat/site/trunk/xdocs/conference.xml Modified: tomcat/site/trunk/docs/conference.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1857556=1857555=1857556=diff == --- tomcat/site/trunk/docs/conference.html (original) +++ tomcat/site/trunk/docs/conference.html Mon Apr 15 10:05:18 2019 @@ -1,310 +1,315 @@ - - - - - -Apache Tomcat - TomcatCon - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide -
svn commit: r1857572 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: markt
Date: Mon Apr 15 12:43:09 2019
New Revision: 1857572
URL: http://svn.apache.org/viewvc?rev=1857572=rev
Log:
Update for 9.0.19 release
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/security-9.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1857572=1857571=1857572=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Mon Apr 15 12:43:09 2019
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
# - Tomcat versions -
tomcat70=7.0.94
tomcat85=8.5.40
-tomcat90=9.0.17
+tomcat90=9.0.19
# - Download destination -
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1857572=1857571=1857572=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Apr 15 12:43:09 2019
@@ -60,14 +60,14 @@
Latest Stable 9.0.x Release
-2019-03-18
-9.0.17
+2019-04-13
+9.0.19
Latest Stable 8.5.x Release
-2019-03-19
+2019-04-12
8.5.40
Modified: tomcat/site/trunk/docs/download-90.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1857572=1857571=1857572=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Mon Apr 15 12:43:09 2019
@@ -216,7 +216,7 @@
Quick Navigation
-[define v]9.0.17[end]
+[define v]9.0.19[end]
https://www.apache.org/dist/tomcat/tomcat-9/KEYS;>KEYS |
[v] |
Browse |
Modified: tomcat/site/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1857572=1857571=1857572=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Apr 15 12:43:09 2019
@@ -239,17 +239,14 @@ these users and their stories are listed
project logo are trademarks of the Apache Software Foundation.
-
-2019-04-12
Tomcat 8.5.40 Released
+
+2019-04-13
Tomcat 9.0.19 Released
-The Apache Tomcat Project is proud to announce the release of version 8.5.40
-of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features
-pulled forward from Tomcat 9.0.x. The minimum Java version and implemented
-specification versions remain unchanged. The notable changes compared
-to 8.5.39 include:
+The Apache Tomcat Project is proud to announce the release of version 9.0.19
+of Apache Tomcat. The notable changes compared to 9.0.17 include:
@@ -265,27 +262,29 @@ to 8.5.39 include:
Full details of these changes, and all the
other changes, are available in the
-Tomcat 8.5
+Tomcat 9
changelog.
-https://tomcat.apache.org/download-80.cgi;>Download
+https://tomcat.apache.org/download-90.cgi;>Download
-
-2019-04-12
Tomcat 7.0.94 Released
+
+
svn commit: r1857582 [17/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Mon Apr 15 13:58:46 2019 @@ -1,378 +1,380 @@ - - - - - -Apache Tomcat - Apache Tomcat 7 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [22/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/tools.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/tools.html (original) +++ tomcat/site/trunk/docs/tools.html Mon Apr 15 13:58:46 2019 @@ -1,403 +1,425 @@ - - - - - -Apache Tomcat - Developer Tools - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - - -
svn commit: r1857582 [12/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2016.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/oldnews-2016.html (original) +++ tomcat/site/trunk/docs/oldnews-2016.html Mon Apr 15 13:58:46 2019 @@ -1,1617 +1,1612 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [21/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/source.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/source.html (original) +++ tomcat/site/trunk/docs/source.html Mon Apr 15 13:58:46 2019 @@ -1,364 +1,376 @@ - - - - - -Apache Tomcat - Repository Access - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - - -
svn commit: r1857582 [15/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/presentations.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/presentations.html (original) +++ tomcat/site/trunk/docs/presentations.html Mon Apr 15 13:58:46 2019 @@ -1,854 +1,843 @@ - - - - - -Apache Tomcat - Presentations - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [19/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/security-9.html (original) +++ tomcat/site/trunk/docs/security-9.html Mon Apr 15 13:58:46 2019 @@ -1,297 +1,299 @@ - - - - - -Apache Tomcat - Apache Tomcat 9 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [11/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2013.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/oldnews-2013.html (original) +++ tomcat/site/trunk/docs/oldnews-2013.html Mon Apr 15 13:58:46 2019 @@ -1,720 +1,713 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [13/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2017.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2017.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/oldnews-2017.html (original) +++ tomcat/site/trunk/docs/oldnews-2017.html Mon Apr 15 13:58:46 2019 @@ -1,1672 +1,1667 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [20/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-impact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/security-impact.html (original) +++ tomcat/site/trunk/docs/security-impact.html Mon Apr 15 13:58:46 2019 @@ -32,6 +32,11 @@ GO + +https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> + Save the date! + + Apache Tomcat Modified: tomcat/site/trunk/docs/security-jk.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/security-jk.html (original) +++ tomcat/site/trunk/docs/security-jk.html Mon Apr 15 13:58:46 2019 @@ -1,281 +1,286 @@ - - - - - -Apache Tomcat - Apache Tomcat JK Connectors vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -
[tomcat] branch master updated: Add some debug
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 06f456f Add some debug
06f456f is described below
commit 06f456f762dc1b6fa5df44da9f0c3cf70ae202f0
Author: remm
AuthorDate: Mon Apr 15 15:32:55 2019 +0200
Add some debug
---
java/org/apache/coyote/http2/Http2AsyncParser.java | 3 +++
java/org/apache/coyote/http2/LocalStrings.properties | 1 +
2 files changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http2/Http2AsyncParser.java
b/java/org/apache/coyote/http2/Http2AsyncParser.java
index 92531bf..d8f2767 100644
--- a/java/org/apache/coyote/http2/Http2AsyncParser.java
+++ b/java/org/apache/coyote/http2/Http2AsyncParser.java
@@ -237,6 +237,9 @@ class Http2AsyncParser extends Http2Parser {
// Always a fatal IO error
error = e;
if (state == null || state == CompletionState.DONE) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http2Parser.error", connectionId,
Integer.valueOf(streamId), frameType), e);
+}
upgradeHandler.upgradeDispatch(SocketEvent.ERROR);
}
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 1320e60..17dbf88 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -44,6 +44,7 @@ hpackdecoder.zeroNotValidHeaderTableIndex=Zero is not a valid
header table index
hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=Huffman encoded value in
HPACK headers did not end with EOS padding
hpackhuffman.stringLiteralTooMuchPadding=More than 7 bits of EOS padding were
provided at the end of an Huffman encoded string literal
+http2Parser.error=Connection [{0}], Stream [{1}], Frame type [{2}], Error
http2Parser.headerLimitCount=Connection [{0}], Stream [{1}], Too many headers
http2Parser.headerLimitSize=Connection [{0}], Stream [{1}], Total header size
too big
http2Parser.headers.wrongFrameType=Connection [{0}], headers in progress for
stream [{1}] but a frame of type [{2}] was received
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1857582 [16/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Mon Apr 15 13:58:46 2019 @@ -1,593 +1,621 @@ - - - - - -Apache Tomcat - Apache Tomcat 6 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [10/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2012.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/oldnews-2012.html (original) +++ tomcat/site/trunk/docs/oldnews-2012.html Mon Apr 15 13:58:46 2019 @@ -1,921 +1,893 @@ - - - - - -Apache Tomcat - Old news! - 2012 - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [6/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Mon Apr 15 13:58:46 2019 @@ -1,565 +1,559 @@ - - - - - -Apache Tomcat - Welcome! - - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - - -
svn commit: r1857582 [9/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/migration-9.html (original) +++ tomcat/site/trunk/docs/migration-9.html Mon Apr 15 13:58:46 2019 @@ -1,484 +1,506 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 9.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [18/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/security-8.html (original) +++ tomcat/site/trunk/docs/security-8.html Mon Apr 15 13:58:46 2019 @@ -1,357 +1,359 @@ - - - - - -Apache Tomcat - Apache Tomcat 8 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [1/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: jfclere Date: Mon Apr 15 13:58:46 2019 New Revision: 1857582 URL: http://svn.apache.org/viewvc?rev=1857582=rev Log: Add ApacheCon NA and EU link on all pages. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/conference.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews-2013.html tomcat/site/trunk/docs/oldnews-2014.html tomcat/site/trunk/docs/oldnews-2015.html tomcat/site/trunk/docs/oldnews-2016.html tomcat/site/trunk/docs/oldnews-2017.html tomcat/site/trunk/docs/oldnews-2018.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security-taglibs.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/source.html tomcat/site/trunk/docs/taglibs.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tomcat-60-eol.html tomcat/site/trunk/docs/tomcat-80-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Mon Apr 15 13:58:46 2019 @@ -1,587 +1,585 @@ - - - - - -Apache Tomcat - Reporting Bugs - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -
svn commit: r1857582 [7/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/migration-7.html (original) +++ tomcat/site/trunk/docs/migration-7.html Mon Apr 15 13:58:46 2019 @@ -1,698 +1,685 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 7.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857582 [14/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2018.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2018.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/oldnews-2018.html (original) +++ tomcat/site/trunk/docs/oldnews-2018.html Mon Apr 15 13:58:46 2019 @@ -32,6 +32,11 @@ GO + +https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> + Save the date! + + Apache Tomcat Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Mon Apr 15 13:58:46 2019 @@ -1,473 +1,475 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native -
svn commit: r1857582 [3/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/conference.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/conference.html (original) +++ tomcat/site/trunk/docs/conference.html Mon Apr 15 13:58:46 2019 @@ -31,6 +31,11 @@ GO + +https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> + Save the date! + + Apache Tomcat Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Mon Apr 15 13:58:46 2019 @@ -31,6 +31,11 @@ GO + +https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> + Save the date! + + Apache Tomcat Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Mon Apr 15 13:58:46 2019 @@ -1,233 +1,235 @@ - - - - - -Apache Tomcat - Apache Tomcat 7 Software Downloads - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 -
svn commit: r1857582 [5/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/findhelp.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/findhelp.html (original) +++ tomcat/site/trunk/docs/findhelp.html Mon Apr 15 13:58:46 2019 @@ -1,296 +1,295 @@ - - - - - -Apache Tomcat - Find Help - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - - -
svn commit: r1857582 [8/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-85.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/migration-85.html (original) +++ tomcat/site/trunk/docs/migration-85.html Mon Apr 15 13:58:46 2019 @@ -1,378 +1,386 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 8.5.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - -
svn commit: r1857582 [2/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Mon Apr 15 13:58:46 2019 @@ -1,985 +1,936 @@ - - - - - -Apache Tomcat - Continuous Integration - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - - -
svn commit: r1857582 [4/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1857582=1857581=1857582=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Mon Apr 15 13:58:46 2019 @@ -1,233 +1,235 @@ - - - - - -Apache Tomcat - Apache Tomcat 9 Software Downloads - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1857570 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/
Author: markt Date: Mon Apr 15 12:33:01 2019 New Revision: 1857570 URL: http://svn.apache.org/viewvc?rev=1857570=rev Log: Update docs for 9.0.19 release [This commit notification would consist of 67 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - 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 tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4212 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 master] 06f456f762dc1b6fa5df44da9f0c3cf70ae202f0 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
[ANN] Apache Tomcat 9.0.19 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 9.0.19. Apache Tomcat 9 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and JASPIC technologies. Apache Tomcat 9.0.19 is a bugfix and feature release. The notable changes compared to 9.0.17 include: - Fix for CVE-2019-0232, an RCE vulnerability on Windows - Add support for Java 11 to the JSP compiler. Java 12 and 13 are also now supported if used with a ECJ version with support for those Java versions - Various NIO2 stability improvements Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-9.0-doc/changelog.html Downloads: http://tomcat.apache.org/download-90.cgi Migration guides from Apache Tomcat 7.x and 8.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix possible connection leak with async
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new cda8f02 Fix possible connection leak with async
cda8f02 is described below
commit cda8f02e7d2a24eb5eb28a2746c88bad9d4aa015
Author: remm
AuthorDate: Mon Apr 15 18:59:59 2019 +0200
Fix possible connection leak with async
It is necessary to go back to the handler for connection cleanup at the
moment.
---
java/org/apache/coyote/http2/Http2AsyncParser.java | 14 ++
java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncParser.java
b/java/org/apache/coyote/http2/Http2AsyncParser.java
index d8f2767..448f3ce 100644
--- a/java/org/apache/coyote/http2/Http2AsyncParser.java
+++ b/java/org/apache/coyote/http2/Http2AsyncParser.java
@@ -31,16 +31,14 @@ import
org.apache.tomcat.util.net.SocketWrapperBase.CompletionState;
class Http2AsyncParser extends Http2Parser {
private final SocketWrapperBase socketWrapper;
-private final Http2AsyncUpgradeHandler upgradeHandler;
private Throwable error = null;
private final ByteBuffer header;
private final ByteBuffer framePaylod;
-Http2AsyncParser(String connectionId, Input input, Output output,
SocketWrapperBase socketWrapper, Http2AsyncUpgradeHandler upgradeHandler) {
+Http2AsyncParser(String connectionId, Input input, Output output,
SocketWrapperBase socketWrapper) {
super(connectionId, input, output);
this.socketWrapper = socketWrapper;
socketWrapper.getSocketBufferHandler().expand(input.getMaxFrameSize());
-this.upgradeHandler = upgradeHandler;
header = ByteBuffer.allocate(9);
framePaylod = ByteBuffer.allocate(input.getMaxFrameSize());
}
@@ -228,7 +226,7 @@ class Http2AsyncParser extends Http2Parser {
if (state == CompletionState.DONE) {
// The call was not completed inline, so must start reading
new frames
// or process the stream exception
-upgradeHandler.upgradeDispatch(SocketEvent.OPEN_READ);
+socketWrapper.processSocket(SocketEvent.OPEN_READ, false);
}
}
@@ -236,11 +234,11 @@ class Http2AsyncParser extends Http2Parser {
public void failed(Throwable e, Void attachment) {
// Always a fatal IO error
error = e;
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http2Parser.error", connectionId,
Integer.valueOf(streamId), frameType), e);
+}
if (state == null || state == CompletionState.DONE) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("http2Parser.error", connectionId,
Integer.valueOf(streamId), frameType), e);
-}
-upgradeHandler.upgradeDispatch(SocketEvent.ERROR);
+socketWrapper.processSocket(SocketEvent.ERROR, true);
}
}
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index f4559a3..de80eb1 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -69,7 +69,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
@Override
protected Http2Parser getParser(String connectionId) {
-return new Http2AsyncParser(connectionId, this, this, socketWrapper,
this);
+return new Http2AsyncParser(connectionId, this, this, socketWrapper);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bff8bea..ed16730 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -58,6 +58,9 @@
The useAsyncIO boolean attribute on the Connector element
value now defaults to true. (remm)
+
+Possible HTTP/2 connection leak issue when using async. (remm)
+
-
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 tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4215 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 master] ac53f551f78788dccf554d05a7aa2fa0f7b5c85c 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
[tomcat] branch master updated: Add sync on operation
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new b0393cb Add sync on operation
b0393cb is described below
commit b0393cbafc4324a85bb5759f15954e1b96f3bc8b
Author: remm
AuthorDate: Mon Apr 15 18:17:26 2019 +0200
Add sync on operation
As an experiment, to mimic sync on the wrapper. Also add error handling
when executing the operation.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 81 +++-
1 file changed, 52 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 8ac66ff..3fc5564 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -39,6 +39,7 @@ import java.nio.channels.WritableByteChannel;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -811,14 +812,18 @@ public class NioEndpoint extends
AbstractJsseEndpoint
// Read goes before write
if (sk.isReadable()) {
if (socketWrapper.readOperation != null) {
-
getExecutor().execute(socketWrapper.readOperation);
+if
(!socketWrapper.readOperation.process()) {
+closeSocket = true;
+}
} else if (!processSocket(socketWrapper,
SocketEvent.OPEN_READ, true)) {
closeSocket = true;
}
}
if (!closeSocket && sk.isWritable()) {
if (socketWrapper.writeOperation != null) {
-
getExecutor().execute(socketWrapper.writeOperation);
+if
(!socketWrapper.writeOperation.process()) {
+closeSocket = true;
+}
} else if (!processSocket(socketWrapper,
SocketEvent.OPEN_WRITE, true)) {
closeSocket = true;
}
@@ -1436,38 +1441,56 @@ public class NioEndpoint extends
AbstractJsseEndpoint
private volatile long nBytes = 0;
private volatile CompletionState state = CompletionState.PENDING;
+public boolean process() {
+try {
+getEndpoint().getExecutor().execute(this);
+} catch (RejectedExecutionException ree) {
+log.warn(sm.getString("endpoint.executor.fail",
NioSocketWrapper.this) , ree);
+return false;
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+// This means we got an OOM or similar creating a thread,
or that
+// the pool and its queue are full
+log.error(sm.getString("endpoint.process.fail"), t);
+return false;
+}
+return true;
+}
+
@Override
public void run() {
-// Perform the IO operation
-// Called from the poller to continue the IO operation
-long nBytes = 0;
-if (getError() == null) {
-try {
-if (read) {
-nBytes = getSocket().read(buffers, offset, length);
-} else {
-nBytes = getSocket().write(buffers, offset,
length);
+synchronized (semaphore) {
+// Perform the IO operation
+// Called from the poller to continue the IO operation
+long nBytes = 0;
+if (getError() == null) {
+try {
+if (read) {
+nBytes = getSocket().read(buffers, offset,
length);
+} else {
+nBytes = getSocket().write(buffers, offset,
length);
+}
+} catch (IOException e) {
+setError(e);
}
-} catch (IOException e) {
-setError(e);
-}
-}
-if
[tomcat] branch master updated: Drop sync experiment
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new ac53f55 Drop sync experiment
ac53f55 is described below
commit ac53f551f78788dccf554d05a7aa2fa0f7b5c85c
Author: remm
AuthorDate: Mon Apr 15 20:29:59 2019 +0200
Drop sync experiment
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 56
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 3fc5564..97bd44a 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1459,38 +1459,36 @@ public class NioEndpoint extends
AbstractJsseEndpoint
@Override
public void run() {
-synchronized (semaphore) {
-// Perform the IO operation
-// Called from the poller to continue the IO operation
-long nBytes = 0;
-if (getError() == null) {
-try {
-if (read) {
-nBytes = getSocket().read(buffers, offset,
length);
-} else {
-nBytes = getSocket().write(buffers, offset,
length);
-}
-} catch (IOException e) {
-setError(e);
-}
-}
-if (nBytes > 0) {
-// The bytes read are only updated in the completion
handler
-completion.completed(Long.valueOf(nBytes), this);
-} else if (nBytes < 0 || getError() != null) {
-IOException error = getError();
-if (error == null) {
-error = new EOFException();
-}
-completion.failed(error, this);
-} else {
-// As soon as the operation uses the poller, it is no
longer inline
-inline = false;
+// Perform the IO operation
+// Called from the poller to continue the IO operation
+long nBytes = 0;
+if (getError() == null) {
+try {
if (read) {
-registerReadInterest();
+nBytes = getSocket().read(buffers, offset, length);
} else {
-registerWriteInterest();
+nBytes = getSocket().write(buffers, offset,
length);
}
+} catch (IOException e) {
+setError(e);
+}
+}
+if (nBytes > 0) {
+// The bytes read are only updated in the completion
handler
+completion.completed(Long.valueOf(nBytes), this);
+} else if (nBytes < 0 || getError() != null) {
+IOException error = getError();
+if (error == null) {
+error = new EOFException();
+}
+completion.failed(error, this);
+} else {
+// As soon as the operation uses the poller, it is no
longer inline
+inline = false;
+if (read) {
+registerReadInterest();
+} else {
+registerWriteInterest();
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4214 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 master] cda8f02e7d2a24eb5eb28a2746c88bad9d4aa015 Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4217 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 master] 3d977d6138ae86725bbcb722036041a95425416a Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63350] New: JSP out.print() does not rethrow IOException
https://bz.apache.org/bugzilla/show_bug.cgi?id=63350
Bug ID: 63350
Summary: JSP out.print() does not rethrow IOException
Product: Tomcat 9
Version: 9.0.19
Hardware: PC
OS: Mac OS X 10.1
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: pmd1nh...@yahoo.com
Target Milestone: -
Hi,
The out.print() does not rethrow IOException back to the caller JSP. While the
PrintWriter APIs do not throw any IOException, the JSPWriter (which is the type
for the implicit "out") should throw the IOException.
Simple JSP to recreate the issue:
<%
System.out.println("JSP start");
try {
for (int i=0 ; i<43490 ; i++) {
out.print("xyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxyxy");
}
out.print("END_OF_DATA");
}
catch(java.io.IOException e) {
System.out.println("caught a IOException !!!");
e.printStackTrace(System.out);
throw e;
}
System.out.println("JSP end");
%>
While request to the JSP, immediately cancel the connection (by ctrl-C). That
will cause a broken pipe connection and result in the IOException.
The JSPWriterImpl's "out" is back by the ServletResponse.getWriter() which is
the PrintWriter.
private void initOut() throws IOException {
if (out == null) {
out = response.getWriter();
}
}
So I think this PrintWriter has swallowed the IOException.
Thanks,
--
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
[tomcat] branch master updated: Cleanup according to current object names, no change
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 9b91bc7 Cleanup according to current object names, no change
9b91bc7 is described below
commit 9b91bc78a5492c21709b840f8b4ad8030d3fb2f4
Author: remm
AuthorDate: Mon Apr 15 23:40:54 2019 +0200
Cleanup according to current object names, no change
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 43 +---
1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 97bd44a..7a9e708 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -676,24 +676,27 @@ public class NioEndpoint extends
AbstractJsseEndpoint
addEvent(r);
}
-public NioSocketWrapper cancelledKey(SelectionKey key) {
-NioSocketWrapper ka = null;
+public NioSocketWrapper cancelledKey(SelectionKey sk) {
+NioSocketWrapper socketWrapper = null;
try {
-if ( key == null ) return null;//nothing to do
-ka = (NioSocketWrapper) key.attach(null);
-if (ka != null) {
+if (sk == null) {
+// Nothing to do
+return null;
+}
+socketWrapper = (NioSocketWrapper) sk.attach(null);
+if (socketWrapper != null) {
// If attachment is non-null then there may be a current
// connection with an associated processor.
-getHandler().release(ka);
+getHandler().release(socketWrapper);
}
-if (key.isValid()) key.cancel();
+if (sk.isValid()) sk.cancel();
// If it is available, close the NioChannel first which should
// in turn close the underlying SocketChannel. The NioChannel
// needs to be closed first, if available, to ensure that TLS
// connections are shut down cleanly.
-if (ka != null) {
+if (socketWrapper != null) {
try {
-ka.getSocket().close(true);
+socketWrapper.getSocket().close(true);
} catch (Exception e){
if (log.isDebugEnabled()) {
log.debug(sm.getString(
@@ -703,9 +706,9 @@ public class NioEndpoint extends
AbstractJsseEndpoint
}
// The SocketChannel is also available via the SelectionKey. If
// it hasn't been closed in the block above, close it now.
-if (key.channel().isOpen()) {
+if (sk.channel().isOpen()) {
try {
-key.channel().close();
+sk.channel().close();
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString(
@@ -714,22 +717,24 @@ public class NioEndpoint extends
AbstractJsseEndpoint
}
}
try {
-if (ka != null && ka.getSendfileData() != null
-&& ka.getSendfileData().fchannel != null
-&& ka.getSendfileData().fchannel.isOpen()) {
-ka.getSendfileData().fchannel.close();
+if (socketWrapper != null &&
socketWrapper.getSendfileData() != null
+&& socketWrapper.getSendfileData().fchannel != null
+&&
socketWrapper.getSendfileData().fchannel.isOpen()) {
+socketWrapper.getSendfileData().fchannel.close();
}
} catch (Exception ignore) {
}
-if (ka != null) {
+if (socketWrapper != null) {
countDownConnection();
-ka.closed = true;
+socketWrapper.closed = true;
}
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
-if (log.isDebugEnabled()) log.error("",e);
+if (log.isDebugEnabled()) {
+log.error("", e);
+}
}
-return ka;
+return socketWrapper;
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Port NIO2 close refactoring to NIO
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 3d977d6 Port NIO2 close refactoring to NIO
3d977d6 is described below
commit 3d977d6138ae86725bbcb722036041a95425416a
Author: remm
AuthorDate: Tue Apr 16 00:13:10 2019 +0200
Port NIO2 close refactoring to NIO
Fix socket close discrepancies for NIO, now the wrapper close is used
everywhere except for socket accept problems.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 76 +++-
webapps/docs/changelog.xml | 4 ++
2 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 7a9e708..b869876 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -531,8 +531,10 @@ public class NioEndpoint extends
AbstractJsseEndpoint
// processed. Count down the connections at this point
// since it won't have been counted down when the
socket
// closed.
-
socket.socketWrapper.getEndpoint().countDownConnection();
-((NioSocketWrapper) socket.socketWrapper).closed =
true;
+try {
+socket.socketWrapper.close();
+} catch (Exception ignore) {
+}
} else {
final NioSocketWrapper socketWrapper =
(NioSocketWrapper) key.attachment();
if (socketWrapper != null) {
@@ -685,25 +687,18 @@ public class NioEndpoint extends
AbstractJsseEndpoint
}
socketWrapper = (NioSocketWrapper) sk.attach(null);
if (socketWrapper != null) {
-// If attachment is non-null then there may be a current
-// connection with an associated processor.
-getHandler().release(socketWrapper);
-}
-if (sk.isValid()) sk.cancel();
-// If it is available, close the NioChannel first which should
-// in turn close the underlying SocketChannel. The NioChannel
-// needs to be closed first, if available, to ensure that TLS
-// connections are shut down cleanly.
-if (socketWrapper != null) {
try {
-socketWrapper.getSocket().close(true);
-} catch (Exception e){
+socketWrapper.close();
+} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString(
-"endpoint.debug.socketCloseFail"), e);
+"endpoint.debug.channelCloseFail"), e);
}
}
}
+if (sk.isValid()) {
+sk.cancel();
+}
// The SocketChannel is also available via the SelectionKey. If
// it hasn't been closed in the block above, close it now.
if (sk.channel().isOpen()) {
@@ -716,18 +711,6 @@ public class NioEndpoint extends
AbstractJsseEndpoint
}
}
}
-try {
-if (socketWrapper != null &&
socketWrapper.getSendfileData() != null
-&& socketWrapper.getSendfileData().fchannel != null
-&&
socketWrapper.getSendfileData().fchannel.isOpen()) {
-socketWrapper.getSendfileData().fchannel.close();
-}
-} catch (Exception ignore) {
-}
-if (socketWrapper != null) {
-countDownConnection();
-socketWrapper.closed = true;
-}
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
if (log.isDebugEnabled()) {
@@ -1215,7 +1198,44 @@ public class NioEndpoint extends
AbstractJsseEndpoint
@Override
public void close() throws IOException {
-getSocket().close();
+if (log.isDebugEnabled()) {
+log.debug("Calling [" + getEndpoint() + "].closeSocket([" +
this + "])", new Exception());
+}
+try {
+getEndpoint().getHandler().release(this);
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+if (log.isDebugEnabled()) {
+log.error("Channel close
