date:20200212

svn commit: r1873932 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ api/ ap

2020-02-12 Thread markt

Author: markt
Date: Wed Feb 12 09:05:58 2020
New Revision: 1873932

URL: http://svn.apache.org/viewvc?rev=1873932&view=rev
Log:
Update docs for 9.0.31 release


[This commit notification would consist of 90 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

svn commit: r1873933 [1/4] - in /tomcat/site/trunk: ./ docs/ xdocs/

2020-02-12 Thread markt

Author: markt
Date: Wed Feb 12 09:08:42 2020
New Revision: 1873933

URL: http://svn.apache.org/viewvc?rev=1873933&view=rev
Log:
Update site for 9.0.31 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/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/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1873933&r1=1873932&r2=1873933&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Feb 12 09:08:42 2020
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
 # - Tomcat versions -
 tomcat70=7.0.99
 tomcat85=8.5.50
-tomcat90=9.0.30
+tomcat90=9.0.31
 
 # - 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=1873933&r1=1873932&r2=1873933&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Feb 12 09:08:42 2020
@@ -60,8 +60,8 @@
 
   
 Latest Stable 9.0.x Release
-2019-12-12
-9.0.30
+2020-02-11
+9.0.31
   
 
 

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1873933&r1=1873932&r2=1873933&view=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Feb 12 09:08:42 2020
@@ -1,249 +1,243 @@
 
 
-
-
-
-
-
-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
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+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
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-Apache Tomcat
-
-
-Home
-
-
-Taglibs
-
-
-Maven Plugin
-
-
-
-
-Download
-

svn commit: r1873933 [3/4] - in /tomcat/site/trunk: ./ docs/ xdocs/

2020-02-12 Thread markt

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1873933&r1=1873932&r2=1873933&view=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Wed Feb 12 09:08:42 2020
@@ -1,1207 +1,1234 @@
 
 
-
-
-
-
-
-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
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+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
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-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
-
-

svn commit: r1873933 [4/4] - in /tomcat/site/trunk: ./ docs/ xdocs/

2020-02-12 Thread markt

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1873933&r1=1873932&r2=1873933&view=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Wed Feb 12 09:08:42 2020
@@ -1,237 +1,236 @@
 
 
-
-
-
-
-
-Apache Tomcat® - Which Version Do I Want?
-
-
-
-
-
-
-
-
-
-
-
-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
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+Apache Tomcat® - Which Version Do I Want?
+
+
+
+
+
+
+
+
+
+
+
+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
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-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: r1873933 [2/4] - in /tomcat/site/trunk: ./ docs/ xdocs/

2020-02-12 Thread markt

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1873933&r1=1873932&r2=1873933&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Wed Feb 12 09:08:42 2020
@@ -1,493 +1,509 @@
 
 
-
-
-
-
-
-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
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+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
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-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
-

[ANN] Apache Tomcat 9.0.31 available

2020-02-12 Thread Mark Thomas

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.30.

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.31 is a bugfix and feature release. The notable
changes compared to 9.0.30 include:

- AJP defaults changed to listen the loopback address, require a secret
  and to be disabled in the sample server.xml

- The JmxRemoteLifecycleListener is now deprecated

- The HTTP Connector attribute rejectIllegalHeaderName is renamed to
  rejectIllegalHeader and expanded to include header values as well as
  names

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

svn commit: r1873937 - in /tomcat/site/trunk/docs/tomcat-8.5-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ api/ ap

2020-02-12 Thread markt

Author: markt
Date: Wed Feb 12 12:39:40 2020
New Revision: 1873937

URL: http://svn.apache.org/viewvc?rev=1873937&view=rev
Log:
Update docs for 8.5.51 release


[This commit notification would consist of 87 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

svn commit: r1873938 [1/2] - in /tomcat/site/trunk: ./ docs/ xdocs/

2020-02-12 Thread markt

Author: markt
Date: Wed Feb 12 12:41:08 2020
New Revision: 1873938

URL: http://svn.apache.org/viewvc?rev=1873938&view=rev
Log:
Update site for 8.5.51 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/oldnews.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=1873938&r1=1873937&r2=1873938&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Feb 12 12:41:08 2020
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat70=7.0.99
-tomcat85=8.5.50
+tomcat85=8.5.51
 tomcat90=9.0.31
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1873938&r1=1873937&r2=1873938&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Feb 12 12:41:08 2020
@@ -67,8 +67,8 @@
 
   
 Latest Stable 8.5.x Release
-2019-12-12
-8.5.50
+2020-02-11
+8.5.51
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1873938&r1=1873937&r2=1873938&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Feb 12 12:41:08 2020
@@ -1,249 +1,243 @@
 
 
-
-
-
-
-
-Apache Tomcat® - Apache Tomcat 8 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
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+Apache Tomcat® - Apache Tomcat 8 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
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-Apache Tomcat
-
-
-Home
-
-
-Taglibs
-
-
-Maven Plugin
-
-
-
-
-Download
-
-

svn commit: r1873938 [2/2] - in /tomcat/site/trunk: ./ docs/ xdocs/

2020-02-12 Thread markt

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1873938&r1=1873937&r2=1873938&view=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Wed Feb 12 12:41:08 2020
@@ -1,387 +1,389 @@
 
 
-
-
-
-
-
-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
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+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
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-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

svn commit: r38013 - /release/tomcat/tomcat-9/v9.0.30/

2020-02-12 Thread markt

Author: markt
Date: Wed Feb 12 12:42:06 2020
New Revision: 38013

Log:
Drop 9.0.30 from mirrors

Removed:
release/tomcat/tomcat-9/v9.0.30/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r38014 - /release/tomcat/tomcat-8/v8.5.50/

2020-02-12 Thread markt

Author: markt
Date: Wed Feb 12 12:42:38 2020
New Revision: 38014

Log:
Drop 8.5.50 from mirrors

Removed:
release/tomcat/tomcat-8/v8.5.50/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[ANN] Apache Tomcat 8.5.51 available

2020-02-12 Thread Mark Thomas

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.51.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and Java Authentication Service Provider Interface for
Containers technologies.

Apache Tomcat 8.5.x replaces 8.0.x and includes new features pulled
forward from the 9.0.x branch. The notable changes since 8.5.50 include:

- AJP defaults changed to listen the loopback address, require a secret
  and to be disabled in the sample server.xml

- The JmxRemoteLifecycleListener is now deprecated

- The HTTP Connector attribute rejectIllegalHeaderName is renamed to
  rejectIllegalHeader and expanded to include header values as well as
  names

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.5-doc/changelog.html


Downloads:
http://tomcat.apache.org/download-80.cgi

Migration guides from Apache Tomcat 7.x and 8.0.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

Re: Report issues with Jakarta EE migration tool

2020-02-12 Thread Rémy Maucherat

On Tue, Feb 11, 2020 at 4:49 PM Mark Thomas  wrote:

> On 11/02/2020 15:29, Martin Grigorov wrote:
> >
> >
> > On Tue, Feb 11, 2020, 17:12 Mark Thomas  > > wrote:
> >
> > On 11/02/2020 14:49, Martin Grigorov wrote:
> > > Hi,
> > >
> > > What is the proper place to report issues
> > > with https://github.com/apache/tomcat-jakartaee-migration ?
> > > Since it is under `apache` org there is no 'Issues' tab.
> > > Bugzilla ?!
> >
> > We don't have anywhere yet.
> >
> > GitHub issues is an option. As is Jira and Bugzilla.
> >
> > This could be an opportunity to experiment with GitHUb issues if we
> > want.
> >
> >
> > For this we need to ask Infra team.
>
> Well, yes and no given that I am on the infra team...
>
> If we want to try it I can enable it.
>
>
>  > Don't you want to do something like:
> >
> > destEntry.setMethod(jarEntry.getMethod);
> >
> >
> > If the method is STORED then we also need to set the size and the CRC.
> > And those are more complicated to get.
>
> Ah. I didn't see anything about that being required in the Javadoc for
> setMethod().
>
> Looking at the source for ZipOutputStream it looks like we need 1 of
> compressed size, size or CRC. Of those, I would have thought the size
> was the easiest as we should be able to count the bytes written.
>

Setting the size sounds mundane but is rather horrible to implement, as the
migration occurs after creating the entry. So it suddenly needs to be
buffered, causing more problems. I don't think it should be supported.

Rémy

svn commit: r1873940 [2/2] - in /tomcat/site/trunk: docs/migration-7.html docs/migration-85.html docs/migration-9.html xdocs/migration-7.xml xdocs/migration-85.xml xdocs/migration-9.xml

2020-02-12 Thread markt

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1873940&r1=1873939&r2=1873940&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Wed Feb 12 13:29:06 2020
@@ -287,6 +287,9 @@
 Upgrading 9.0.x
 
 
+Tomcat 9.0.x noteable changes
+
+
 Tomcat 9.0.x 
configuration file differences
 
 
@@ -793,6 +796,7 @@ of Apache Tomcat.
 
 Upgrading 9.0.x
 
+
   
 When upgrading instances of Apache Tomcat from one version of Tomcat 9 to
   another, particularly when using separate locations for $CATALINA_HOME and
@@ -804,6 +808,66 @@ of Apache Tomcat.
 
   
 
+Tomcat 9.0.x noteable changes
+
+
+The Tomcat developers aim for each patch release to be fully backwards
+   compatible with the previous release.  Occasionally, it is necessary to
+   break backwards compatibility in order to fix a bug. In most cases, 
these
+   changes will go unnoticed. This section lists changes that are not fully
+   backwards compatible and might cause breakage when upgrading.
+
+
+  
+
+In 9.0.31 onwards, the default listen address of
+the AJP Connector was changed to the loopback address rather than all
+addresses.
+
+Reference:  AJP
+connector.
+  
+
+  
+
+In 9.0.31 onwards, the requiredSecret attribute
+of the AJP Connector was deprecated and replaced by the
+secret attribute.
+
+Reference:  AJP
+connector.
+  
+
+  
+
+In 9.0.31 onwards, the secretRequired attribute
+was added to the AJP Connector. If set to true, the
+default, the AJP Connector will not start unless a
+secret has been specified.
+
+Reference:  AJP
+connector.
+  
+
+  
+
+In 9.0.31 onwards, the
+allowedRequestAttributesPattern attribute was added to
+the AJP Connector. Requests with unrecognised attributes will now be
+blocked with a 403.
+
+Reference:  AJP
+connector.
+  
+
+
+
+  
+
+
+
+  
+
 Tomcat 9.0.x 
configuration file differences
 
 

Modified: tomcat/site/trunk/xdocs/migration-7.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1873940&r1=1873939&r2=1873940&view=diff
==
--- tomcat/site/trunk/xdocs/migration-7.xml (original)
+++ tomcat/site/trunk/xdocs/migration-7.xml Wed Feb 12 13:29:06 2020
@@ -489,8 +489,8 @@ of Apache Tomcat.
 attribute on connectors was changed to mean a limit of zero rather
 than no limit to align it with maxSavePostSize and to
 be more intuitive.
-Reference: HTTP 
connector,
-AJP connector.
+Reference: HTTP 
connector,
+AJP connector.
   
 
   

Modified: tomcat/site/trunk/xdocs/migration-85.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1873940&r1=1873939&r2=1873940&view=diff
==
--- tomcat/site/trunk/xdocs/migration-85.xml (original)
+++ tomcat/site/trunk/xdocs/migration-85.xml Wed Feb 12 13:29:06 2020
@@ -233,7 +233,32 @@ of Apache Tomcat.
changes will go unnoticed. This section lists changes that are not fully
backwards compatible and might cause breakage when upgrading.
 
-  None.
+  In 8.5.51 onwards, the default listen address of
+the AJP Connector was changed to the loopback address rather than all
+addresses.
+Reference:  AJP
+connector.
+  
+  In 8.5.51 onwards, the requiredSecret attribute
+of the AJP Connector was deprecated and replaced by the
+secret attribute.
+Reference:  AJP
+connector.
+  
+  In 8.5.51 onwards, the secretRequired attribute
+was added to the AJP Connector. If set to true, the
+default, the AJP Connector will not start unless a
+secret has been specified.
+Reference:  AJP
+connector.
+  
+  In 8.5.51 onwards, the
+allowedRequestAttributesPattern attribute was added to
+the AJP Connector. Requests with unrecognised attributes will now be
+blocked with a 403.
+Reference:  AJP
+connector.
+  
 
   
   

Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1873940&r1=1873939&r2=1873940&view=diff
==
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Wed Feb 12 13:29:06 2020
@@ -297,6 +297,7 @@ of Apache Tomcat.
 
 
 
+
   When upgrading instances of Apache Tomcat from one version of Tomcat 9 to
   another, particularly when

svn commit: r1873940 [1/2] - in /tomcat/site/trunk: docs/migration-7.html docs/migration-85.html docs/migration-9.html xdocs/migration-7.xml xdocs/migration-85.xml xdocs/migration-9.xml

2020-02-12 Thread markt

Author: markt
Date: Wed Feb 12 13:29:06 2020
New Revision: 1873940

URL: http://svn.apache.org/viewvc?rev=1873940&view=rev
Log:
Update migration guide to mention AJP changes

Modified:
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/migration-9.xml

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1873940&r1=1873939&r2=1873940&view=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Wed Feb 12 13:29:06 2020
@@ -1,707 +1,688 @@
 
 
-
-
-
-
-
-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
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+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
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-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
-

[tomcat] branch master updated: Save attributes on Resources elements

2020-02-12 Thread remm

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 0f49f7c  Save attributes on Resources elements
0f49f7c is described below

commit 0f49f7c52a300e2ef6012c02d4a852f3a88115da
Author: remm 
AuthorDate: Wed Feb 12 16:34:33 2020 +0100

Save attributes on Resources elements

The transient list came from the old resources which were configured on
the Context, but that's not the case anymore.
---
 java/org/apache/catalina/storeconfig/server-registry.xml | 7 ---
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml 
b/java/org/apache/catalina/storeconfig/server-registry.xml
index 6c46ab0..cdcff27 100644
--- a/java/org/apache/catalina/storeconfig/server-registry.xml
+++ b/java/org/apache/catalina/storeconfig/server-registry.xml
@@ -303,13 +303,6 @@
 children="true"
 tagClass="org.apache.catalina.WebResourceRoot"
 storeFactoryClass="org.apache.catalina.storeconfig.WebResourceRootSF">
-allowLinking
-cachingAllowed
-cacheTtl
-cacheMaxSize
-cacheObjectMaxSize
-cached
-caseSensitive
 domain
  
 web.xml so the MIME type
 mappings are consistent regardless of how Tomcat is started. (markt)
   
+  
+Missing store config attributes for Resources elements. (remm)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Save attributes on Resources elements

2020-02-12 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 37dd320  Save attributes on Resources elements
37dd320 is described below

commit 37dd320f02220a24fcb2a4942f4a86a0822b02d2
Author: remm 
AuthorDate: Wed Feb 12 16:34:33 2020 +0100

Save attributes on Resources elements

The transient list came from the old resources which were configured on
the Context, but that's not the case anymore.
---
 java/org/apache/catalina/storeconfig/server-registry.xml | 7 ---
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml 
b/java/org/apache/catalina/storeconfig/server-registry.xml
index 1223b57..5ab9228 100644
--- a/java/org/apache/catalina/storeconfig/server-registry.xml
+++ b/java/org/apache/catalina/storeconfig/server-registry.xml
@@ -356,13 +356,6 @@
 children="true"
 tagClass="org.apache.catalina.WebResourceRoot"
 storeFactoryClass="org.apache.catalina.storeconfig.WebResourceRootSF">
-allowLinking
-cachingAllowed
-cacheTtl
-cacheMaxSize
-cacheObjectMaxSize
-cached
-caseSensitive
 domain
  
 web.xml so the MIME type
 mappings are consistent regardless of how Tomcat is started. (markt)
   
+  
+Missing store config attributes for Resources elements. (remm)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Save attributes on Resources elements

2020-02-12 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 78f9ba0  Save attributes on Resources elements
78f9ba0 is described below

commit 78f9ba0de01abf0b494b3703ce26cc535004bc94
Author: remm 
AuthorDate: Wed Feb 12 16:34:33 2020 +0100

Save attributes on Resources elements

The transient list came from the old resources which were configured on
the Context, but that's not the case anymore.
---
 java/org/apache/catalina/storeconfig/server-registry.xml | 7 ---
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml 
b/java/org/apache/catalina/storeconfig/server-registry.xml
index 846135d..0f7dd94 100644
--- a/java/org/apache/catalina/storeconfig/server-registry.xml
+++ b/java/org/apache/catalina/storeconfig/server-registry.xml
@@ -355,13 +355,6 @@
 children="true"
 tagClass="org.apache.catalina.WebResourceRoot"
 storeFactoryClass="org.apache.catalina.storeconfig.WebResourceRootSF">
-allowLinking
-cachingAllowed
-cacheTtl
-cacheMaxSize
-cacheObjectMaxSize
-cached
-caseSensitive
 domain
  
 web.xml so the MIME type
 mappings are consistent regardless of how Tomcat is started. (markt)
   
+  
+Missing store config attributes for Resources elements. (remm)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Report issues with Jakarta EE migration tool

2020-02-12 Thread Martin Grigorov

On Wed, Feb 12, 2020 at 3:20 PM Rémy Maucherat  wrote:

> On Tue, Feb 11, 2020 at 4:49 PM Mark Thomas  wrote:
>
>> On 11/02/2020 15:29, Martin Grigorov wrote:
>> >
>> >
>> > On Tue, Feb 11, 2020, 17:12 Mark Thomas > > > wrote:
>> >
>> > On 11/02/2020 14:49, Martin Grigorov wrote:
>> > > Hi,
>> > >
>> > > What is the proper place to report issues
>> > > with https://github.com/apache/tomcat-jakartaee-migration ?
>> > > Since it is under `apache` org there is no 'Issues' tab.
>> > > Bugzilla ?!
>> >
>> > We don't have anywhere yet.
>> >
>> > GitHub issues is an option. As is Jira and Bugzilla.
>> >
>> > This could be an opportunity to experiment with GitHUb issues if we
>> > want.
>> >
>> >
>> > For this we need to ask Infra team.
>>
>> Well, yes and no given that I am on the infra team...
>>
>> If we want to try it I can enable it.
>>
>>
>>  > Don't you want to do something like:
>> >
>> > destEntry.setMethod(jarEntry.getMethod);
>> >
>> >
>> > If the method is STORED then we also need to set the size and the CRC.
>> > And those are more complicated to get.
>>
>> Ah. I didn't see anything about that being required in the Javadoc for
>> setMethod().
>>
>> Looking at the source for ZipOutputStream it looks like we need 1 of
>> compressed size, size or CRC. Of those, I would have thought the size
>> was the easiest as we should be able to count the bytes written.
>>
>
> Setting the size sounds mundane but is rather horrible to implement, as
> the migration occurs after creating the entry. So it suddenly needs to be
> buffered, causing more problems. I don't think it should be supported.
>

Yes, I've tried a couple of different ways to implement it but it is not
working so far.

Martin


>
> Rémy
>
>

buildbot failure in on tomcat-9-trunk

2020-02-12 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/45

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 37dd320f02220a24fcb2a4942f4a86a0822b02d2
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

Re: Numbering schemes for future releases

2020-02-12 Thread Konstantin Kolinko

Hi!

пн, 10 февр. 2020 г. в 12:47, Mark Thomas :
>
>  [...]
>
> I have tried to express the various options I have seen proposed in a
> similar way so we can compare them. If I have missed one or you think of
> a different one then please post it.
>
> Option A: [...] Option D:

1. If we are going to release a version of Tomcat for Jakarta EE 9,
I need a proper version number to name it, and "10.0.0" is not such a number.

As such, I am strongly -1 to option A.

2. Option C looks like a waste. It may occur naturally if it takes too long to
stabilize Tomcat and Jakarta EE 10 comes sooner.

I am -0 to Option C.

3. I like both "B" and "D".

I think that we can go with "D", but be prepared to switch to "B" in
case if Jakarta EE 10 occurs to be much different from Jakarta EE 9.

The deciding point for me will be whether Jakarta EE 10 allows running
with Java 8.
If it does not, I would prefer option "B" rather than "D".

Re: Mark's
> I don't like option B because the off-by-one issue between Jakarta EE
> and Tomcat.

For me aligning Tomcat version and Jakarta EE is not a practical goal.
It did not happen before. It may occur naturally, but I do not like to
aim for it.

Offtopic: I had a similar discussion in another project several years
ago, and the outcome was that there is no need for an alignment (The
discussion was about aligning TortoiseSVN with Apache Subversion).
[1][2]

[1] https://subvserion.markmail.org/thread/s3d7sz4percblwbv
[2] https://tortoisesvn.markmail.org/thread/f63wx54jzclngojo

Re: Remy's
> -1 for option B also because the EOL of that "major" Tomcat 10 branch may be 
> way too quick for a major branch.

I think that nowadays it is OK to have a major branch that is not a
LTS one. It has not happen in Tomcat yet, but It happens in many other
projects.


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-85-trunk

2020-02-12 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2164

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 78f9ba0de01abf0b494b3703ce26cc535004bc94
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: Fix timeout on zero length read/write with useAsyncIO for NIO and APR

2020-02-12 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt 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 5a36c39  Fix timeout on zero length read/write with useAsyncIO for NIO 
and APR
5a36c39 is described below

commit 5a36c3941e99d7e1554bc68cd2acef53c76d5fcb
Author: Mark Thomas 
AuthorDate: Wed Feb 12 17:27:25 2020 +

Fix timeout on zero length read/write with useAsyncIO for NIO and APR
---
 java/org/apache/tomcat/util/net/AprEndpoint.java   |  1 +
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  9 -
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  4 ++--
 java/org/apache/tomcat/util/net/SocketWrapperBase.java |  9 +
 webapps/docs/changelog.xml | 10 ++
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index b8b71e3..ec9deee 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2646,6 +2646,7 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 }
 if (buffer == null && flushBytes == 0) {
 // Nothing to do
+completion.completed(Long.valueOf(0), this);
 return;
 }
 if (read) {
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 35c9df8..2175667 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -727,15 +727,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint
 updateLastWrite();
 }
 }
-if (nBytes != 0) {
+if (nBytes != 0 || !arrayHasData(buffers)) {
 completionDone = false;
 }
 }
@@ -1465,7 +1465,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 setError(e);
 }
 }
-if (nBytes > 0) {
+if (nBytes > 0 || (nBytes == 0 && !arrayHasData(buffers))) {
 // The bytes processed are only updated in the completion 
handler
 completion.completed(Long.valueOf(nBytes), this);
 } else if (nBytes < 0 || getError() != null) {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 006e9c2..40ccd5d 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -1444,4 +1444,13 @@ public abstract class SocketWrapperBase {
 }
 return max;
 }
+
+protected static boolean arrayHasData(ByteBuffer[] byteBuffers) {
+for (ByteBuffer byteBuffer : byteBuffers) {
+if (byteBuffer.hasRemaining()) {
+return true;
+}
+}
+return false;
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b844626..c3fc696 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -66,6 +66,16 @@
   
 
   
+  
+
+  
+When the NIO or APR/native connectors were configured with
+useAsyncIO="true" and a zero length read or write was
+performed, the read/write would time out rather than return 
immediately.
+(markt)
+  
+
+  
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Fix timeout on zero length read/write with useAsyncIO for NIO and APR

2020-02-12 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new d779026  Fix timeout on zero length read/write with useAsyncIO for NIO 
and APR
d779026 is described below

commit d779026837238cb320dbfdb3e6bd6d78fdc793fb
Author: Mark Thomas 
AuthorDate: Wed Feb 12 17:27:25 2020 +

Fix timeout on zero length read/write with useAsyncIO for NIO and APR
---
 java/org/apache/tomcat/util/net/AprEndpoint.java   |  1 +
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  9 -
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  4 ++--
 java/org/apache/tomcat/util/net/SocketWrapperBase.java |  9 +
 webapps/docs/changelog.xml | 10 ++
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index b8b71e3..ec9deee 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2646,6 +2646,7 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 }
 if (buffer == null && flushBytes == 0) {
 // Nothing to do
+completion.completed(Long.valueOf(0), this);
 return;
 }
 if (read) {
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index adafdad..67d0b81 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -726,15 +726,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint
 updateLastWrite();
 }
 }
-if (nBytes != 0) {
+if (nBytes != 0 || !arrayHasData(buffers)) {
 completionDone = false;
 }
 }
@@ -1551,7 +1551,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 setError(e);
 }
 }
-if (nBytes > 0) {
+if (nBytes > 0 || (nBytes == 0 && !arrayHasData(buffers))) {
 // The bytes processed are only updated in the completion 
handler
 completion.completed(Long.valueOf(nBytes), this);
 } else if (nBytes < 0 || getError() != null) {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index f205725..383d96c 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -1474,4 +1474,13 @@ public abstract class SocketWrapperBase {
 }
 return max;
 }
+
+protected static boolean arrayHasData(ByteBuffer[] byteBuffers) {
+for (ByteBuffer byteBuffer : byteBuffers) {
+if (byteBuffer.hasRemaining()) {
+return true;
+}
+}
+return false;
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0906b88..18dede0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -66,6 +66,16 @@
   
 
   
+  
+
+  
+When the NIO or APR/native connectors were configured with
+useAsyncIO="true" and a zero length read or write was
+performed, the read/write would time out rather than return 
immediately.
+(markt)
+  
+
+  
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Fix timeout on zero length read/write with useAsyncIO for NIO and APR

2020-02-12 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 396353c  Fix timeout on zero length read/write with useAsyncIO for NIO 
and APR
396353c is described below

commit 396353c9d0eeb8648009023525f2605b9d04ee83
Author: Mark Thomas 
AuthorDate: Wed Feb 12 17:27:25 2020 +

Fix timeout on zero length read/write with useAsyncIO for NIO and APR
---
 java/org/apache/tomcat/util/net/AprEndpoint.java   |  1 +
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  9 -
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  4 ++--
 java/org/apache/tomcat/util/net/SocketWrapperBase.java |  9 +
 webapps/docs/changelog.xml | 10 ++
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 64f0257..9849417 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2690,6 +2690,7 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 }
 if (buffer == null && flushBytes == 0) {
 // Nothing to do
+completion.completed(Long.valueOf(0), this);
 return;
 }
 if (read) {
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index ddf9d5e..d17adc0 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -684,15 +684,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint {
 
 }
 
-private static boolean arrayHasData(ByteBuffer[] byteBuffers) {
-for (ByteBuffer byteBuffer : byteBuffers) {
-if (byteBuffer.hasRemaining()) {
-return true;
-}
-}
-return false;
-}
-
 
 public void setSendfileData(SendfileData sf) { this.sendfileData = sf; 
}
 public SendfileData getSendfileData() { return this.sendfileData; }
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index bfac6d7..fe6f65f 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1532,7 +1532,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint {
 updateLastWrite();
 }
 }
-if (nBytes != 0) {
+if (nBytes != 0 || !arrayHasData(buffers)) {
 completionDone = false;
 }
 }
@@ -1540,7 +1540,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint {
 setError(e);
 }
 }
-if (nBytes > 0) {
+if (nBytes > 0 || (nBytes == 0 && !arrayHasData(buffers))) {
 // The bytes processed are only updated in the completion 
handler
 completion.completed(Long.valueOf(nBytes), this);
 } else if (nBytes < 0 || getError() != null) {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index adeba23..3a859e7 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -1425,4 +1425,13 @@ public abstract class SocketWrapperBase {
 }
 return max;
 }
+
+protected static boolean arrayHasData(ByteBuffer[] byteBuffers) {
+for (ByteBuffer byteBuffer : byteBuffers) {
+if (byteBuffer.hasRemaining()) {
+return true;
+}
+}
+return false;
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cb71df5..ff7946c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,6 +72,16 @@
   
 
   
+  
+
+  
+When the NIO or APR/native connectors were configured with
+useAsyncIO="true" and a zero length read or write was
+performed, the read/write would time out rather than return 
immediately.
+(markt)
+  
+
+  
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Fix timeout on zero length read/write with useAsyncIO for NIO and APR

2020-02-12 Thread Mark Thomas

On 12/02/2020 17:36, ma...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt 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 5a36c39  Fix timeout on zero length read/write with useAsyncIO for 
> NIO and APR
> 5a36c39 is described below
> 
> commit 5a36c3941e99d7e1554bc68cd2acef53c76d5fcb
> Author: Mark Thomas 
> AuthorDate: Wed Feb 12 17:27:25 2020 +
> 
> Fix timeout on zero length read/write with useAsyncIO for NIO and APR

For those wondering about this, I found this while testing the Jakarta
WebSocket 2.0 TCK with Tomcat 10. A couple of the tests switch from
buffered to non-buffered messages with any empty buffer and the
subsequent flush triggers a zero length write. Whether that write should
even be triggered is a whole other question...

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-9-trunk

2020-02-12 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/46

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] d779026837238cb320dbfdb3e6bd6d78fdc793fb
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Fix timeout on zero length read/write with useAsyncIO for NIO and APR

2020-02-12 Thread Rémy Maucherat

On Wed, Feb 12, 2020 at 6:42 PM Mark Thomas  wrote:

> On 12/02/2020 17:36, ma...@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > markt 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 5a36c39  Fix timeout on zero length read/write with useAsyncIO
> for NIO and APR
> > 5a36c39 is described below
> >
> > commit 5a36c3941e99d7e1554bc68cd2acef53c76d5fcb
> > Author: Mark Thomas 
> > AuthorDate: Wed Feb 12 17:27:25 2020 +
> >
> > Fix timeout on zero length read/write with useAsyncIO for NIO and APR
>
> For those wondering about this, I found this while testing the Jakarta
> WebSocket 2.0 TCK with Tomcat 10. A couple of the tests switch from
> buffered to non-buffered messages with any empty buffer and the
> subsequent flush triggers a zero length write. Whether that write should
> even be triggered is a whole other question...
>

I think I remember I had problems already before the async API with those
weird tests doing zero length writes in that TCK :(

I may make changes to the fix, since:
- I notice arrayHasData doesn't use offset and length, it's better if it
does
- With NIO arrayHasData is also used for a read, I suppose it's not a
problem but I'll change it anyway

Rémy

Re: [tomcat] branch master updated: Fix timeout on zero length read/write with useAsyncIO for NIO and APR

2020-02-12 Thread Mark Thomas

On 12/02/2020 18:53, Rémy Maucherat wrote:



> I think I remember I had problems already before the async API with
> those weird tests doing zero length writes in that TCK :(
> 
> I may make changes to the fix, since:
> - I notice arrayHasData doesn't use offset and length, it's better if it
> does
> - With NIO arrayHasData is also used for a read, I suppose it's not a
> problem but I'll change it anyway

Thanks for the review.

For read, won't arrayHasData() check if there is any buffer space to
write into? Might need to change the method name in that case. maybe
arrayRemaining() ?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Fix timeout on zero length read/write with useAsyncIO for NIO and APR

2020-02-12 Thread Rémy Maucherat

On Wed, Feb 12, 2020 at 8:02 PM Mark Thomas  wrote:

> On 12/02/2020 18:53, Rémy Maucherat wrote:
>
> 
>
> > I think I remember I had problems already before the async API with
> > those weird tests doing zero length writes in that TCK :(
> >
> > I may make changes to the fix, since:
> > - I notice arrayHasData doesn't use offset and length, it's better if it
> > does
> > - With NIO arrayHasData is also used for a read, I suppose it's not a
> > problem but I'll change it anyway
>
> Thanks for the review.
>
> For read, won't arrayHasData() check if there is any buffer space to
> write into? Might need to change the method name in that case. maybe
> arrayRemaining() ?
>

So that looks ok. I'll add use of the offset/length shortly, it won't hurt.

Rémy

[Bug 64082] Nio2Endpoint for async request doesn't clear OutputBuffer when socket has already been closed (response mixup)

2020-02-12 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64082

--- Comment #12 from william.crow...@roguewave.com ---
Please close this issue.  We cannot provide a valid test 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

[Bug 64082] Nio2Endpoint for async request doesn't clear OutputBuffer when socket has already been closed (response mixup)

2020-02-12 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64082

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |INVALID

-- 
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: Add offset to the buffer remaining method

2020-02-12 Thread remm

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 d24aade  Add offset to the buffer remaining method
d24aade is described below

commit d24aade0fac3fba192c52cc1fb6ab1ffa364ebb6
Author: remm 
AuthorDate: Wed Feb 12 21:59:30 2020 +0100

Add offset to the buffer remaining method

Add a zero length write to the existing test. Also enable the test for
APR.
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java| 10 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java |  4 ++--
 java/org/apache/tomcat/util/net/SocketWrapperBase.java   |  6 +++---
 .../http11/upgrade/TestUpgradeInternalHandler.java   | 16 +++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 2175667..2ed8ae4 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -683,7 +683,7 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint() {
 @Override
 public void completed(Long nBytes, 
ByteBuffer[] buffers) {
 if (nBytes.longValue() < 0) {
 failed(new EOFException(), 
null);
-} else if 
(arrayHasData(buffers)) {
-getSocket().write(array, 
0, array.length, toTimeout(getWriteTimeout()),
-
TimeUnit.MILLISECONDS, array, this);
+} else if 
(buffersArrayHasRemaining(buffers, 0, buffers.length)) {
+getSocket().write(buffers, 
0, buffers.length, toTimeout(getWriteTimeout()),
+
TimeUnit.MILLISECONDS, buffers, this);
 } else {
 // Continue until 
everything is written
 process();
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 773b4d6..bbcf4ca 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1457,7 +1457,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 updateLastWrite();
 }
 }
-if (nBytes != 0 || !arrayHasData(buffers)) {
+if (nBytes != 0 || 
!buffersArrayHasRemaining(buffers, offset, length)) {
 completionDone = false;
 }
 }
@@ -1465,7 +1465,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 setError(e);
 }
 }
-if (nBytes > 0 || (nBytes == 0 && !arrayHasData(buffers))) {
+if (nBytes > 0 || (nBytes == 0 && 
!buffersArrayHasRemaining(buffers, offset, length))) {
 // The bytes processed are only updated in the completion 
handler
 completion.completed(Long.valueOf(nBytes), this);
 } else if (nBytes < 0 || getError() != null) {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 40ccd5d..0658ea6 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -1445,9 +1445,9 @@ public abstract class SocketWrapperBase {
 return max;
 }
 
-protected static boolean arrayHasData(ByteBuffer[] byteBuffers) {
-for (ByteBuffer byteBuffer : byteBuffers) {
-if (byteBuffer.hasRemaining()) {
+protected static boolean buffersArrayHasRemaining(ByteBuffer[] buffers, 
int offset, int length) {
+for (int pos = offset; pos < offset + length; pos++) {
+if (buffers[pos].hasRemaining()) {
 return true;
 }
 }
diff --git 
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java 
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index 9c9421c..eb826f8 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -40,7 +40,6 @@ import jakarta.servlet.http.HttpUpgradeHandler;
 import jaka

[CONF] Apache Tomcat > WebSocket TCK

2020-02-12 Thread Mark Thomas (Confluence)

Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
WebSocket TCK 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited at 08:56 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Remove ws_wait recommendation - it triggers test fialures.  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... websocket.classes=/home/mark/repos/asf-public/tomcat/trunk/output/build/lib/tomcat-websocket.jar:/home/mark/repos/asf-public/tomcat/trunk/output/build/lib/servlet-api.jar:/home/mark/repos/asf-public/tomcat/trunk/output/build/lib/tomcat-util.jar:/home/mark/repos/asf-public/tomcat/trunk/output/build/lib/tomcat-api.jar:/home/mark/repos/asf-public/tomcat/trunk/output/build/bin/tomcat-juli.jar The WebSocket tests use a lot of pauses. The default pause time is 5s which means the elapsed time for the WebSocket tests is very high. It is recommended you set this to the minimum (1s) unless something in your environment means a longer wait is required.  ws_wait=1Do not reduce ws_wait below the default of 5s as it is likely to trigger test failures. set JAVA_HOME Run ant gui Accept the defaults and then run the tests ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.1.2

[tomcat] branch 9.0.x updated: Add offset to the buffer remaining method

2020-02-12 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 23448f5  Add offset to the buffer remaining method
23448f5 is described below

commit 23448f55f4b6364d7b142d33b9bc5a56ea8da7be
Author: remm 
AuthorDate: Wed Feb 12 21:59:30 2020 +0100

Add offset to the buffer remaining method

Add a zero length write to the existing test. Also enable the test for
APR.
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java| 10 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java |  4 ++--
 java/org/apache/tomcat/util/net/SocketWrapperBase.java   |  6 +++---
 .../http11/upgrade/TestUpgradeInternalHandler.java   | 16 +++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 67d0b81..e22d52e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -682,7 +682,7 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint() {
 @Override
 public void completed(Long nBytes, 
ByteBuffer[] buffers) {
 if (nBytes.longValue() < 0) {
 failed(new EOFException(), 
null);
-} else if 
(arrayHasData(buffers)) {
-getSocket().write(array, 
0, array.length, toTimeout(getWriteTimeout()),
-
TimeUnit.MILLISECONDS, array, this);
+} else if 
(buffersArrayHasRemaining(buffers, 0, buffers.length)) {
+getSocket().write(buffers, 
0, buffers.length, toTimeout(getWriteTimeout()),
+
TimeUnit.MILLISECONDS, buffers, this);
 } else {
 // Continue until 
everything is written
 process();
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index af17c3b..66f941c 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1543,7 +1543,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 updateLastWrite();
 }
 }
-if (nBytes != 0 || !arrayHasData(buffers)) {
+if (nBytes != 0 || 
!buffersArrayHasRemaining(buffers, offset, length)) {
 completionDone = false;
 }
 }
@@ -1551,7 +1551,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 setError(e);
 }
 }
-if (nBytes > 0 || (nBytes == 0 && !arrayHasData(buffers))) {
+if (nBytes > 0 || (nBytes == 0 && 
!buffersArrayHasRemaining(buffers, offset, length))) {
 // The bytes processed are only updated in the completion 
handler
 completion.completed(Long.valueOf(nBytes), this);
 } else if (nBytes < 0 || getError() != null) {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 383d96c..91e245e 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -1475,9 +1475,9 @@ public abstract class SocketWrapperBase {
 return max;
 }
 
-protected static boolean arrayHasData(ByteBuffer[] byteBuffers) {
-for (ByteBuffer byteBuffer : byteBuffers) {
-if (byteBuffer.hasRemaining()) {
+protected static boolean buffersArrayHasRemaining(ByteBuffer[] buffers, 
int offset, int length) {
+for (int pos = offset; pos < offset + length; pos++) {
+if (buffers[pos].hasRemaining()) {
 return true;
 }
 }
diff --git 
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java 
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index 7619c45..41a6511 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -39,7 +39,6 @@ import javax.servlet.http.HttpUpgradeHandler;
 import javax.se

[tomcat] branch 8.5.x updated: Add offset to the buffer remaining method

2020-02-12 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new fa5b7d1  Add offset to the buffer remaining method
fa5b7d1 is described below

commit fa5b7d15004e5df5047c5f20b1fbddc091de6ad7
Author: remm 
AuthorDate: Wed Feb 12 21:59:30 2020 +0100

Add offset to the buffer remaining method

Add a zero length write to the existing test.
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java| 12 ++--
 java/org/apache/tomcat/util/net/NioEndpoint.java |  4 ++--
 java/org/apache/tomcat/util/net/SocketWrapperBase.java   |  6 +++---
 .../coyote/http11/upgrade/TestUpgradeInternalHandler.java| 11 +++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index d17adc0..9719b1d 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -644,7 +644,7 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint {
 synchronized (writeCompletionHandler) {
 if (nBytes.longValue() < 0) {
 failed(new 
EOFException(sm.getString("iob.failedwrite")), attachment);
-} else if (!nonBlockingWriteBuffer.isEmpty() || 
arrayHasData(attachment)) {
+} else if (!nonBlockingWriteBuffer.isEmpty() || 
buffersArrayHasRemaining(attachment, 0, attachment.length)) {
 // Continue writing data using a gathering write
 ByteBuffer[] array = 
nonBlockingWriteBuffer.toArray(attachment);
 getSocket().write(array, 0, array.length,
@@ -993,17 +993,17 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint {
 if (!socketBufferHandler.isWriteBufferEmpty()) {
 synchronized (writeCompletionHandler) {
 socketBufferHandler.configureWriteBufferForRead();
-final ByteBuffer[] array = 
nonBlockingWriteBuffer.toArray(socketBufferHandler.getWriteBuffer());
-if (arrayHasData(array)) {
+ByteBuffer[] array = 
nonBlockingWriteBuffer.toArray(socketBufferHandler.getWriteBuffer());
+if (buffersArrayHasRemaining(array, 0, 
array.length)) {
 getSocket().write(array, 0, array.length, 
timeout, unit,
 array, new CompletionHandler() {
 @Override
 public void completed(Long nBytes, 
ByteBuffer[] buffers) {
 if (nBytes.longValue() < 0) {
 failed(new EOFException(), 
null);
-} else if 
(arrayHasData(buffers)) {
-getSocket().write(array, 
0, array.length, toTimeout(getWriteTimeout()),
-
TimeUnit.MILLISECONDS, array, this);
+} else if 
(buffersArrayHasRemaining(buffers, 0, buffers.length)) {
+getSocket().write(buffers, 
0, buffers.length, toTimeout(getWriteTimeout()),
+
TimeUnit.MILLISECONDS, buffers, this);
 } else {
 // Continue until 
everything is written
 process();
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index fe6f65f..4e67f7e 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1532,7 +1532,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint {
 updateLastWrite();
 }
 }
-if (nBytes != 0 || !arrayHasData(buffers)) {
+if (nBytes != 0 || 
!buffersArrayHasRemaining(buffers, offset, length)) {
 completionDone = false;
 }
 }
@@ -1540,7 +1540,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint {
 setError(e);
 }
 }
-if (nBytes > 0 || (nBytes == 0 && !arrayHasData(buffers))) {
+if (nBytes > 0 |

Re: Numbering schemes for future releases

2020-02-12 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Konstantin,

On 2/12/20 11:25 AM, Konstantin Kolinko wrote:
> For me aligning Tomcat version and Jakarta EE is not a practical
> goal. It did not happen before.

The contemporary Tomcat and Java EE versions have never been this
close before.

> It may occur naturally, but I do not like to aim for it.

Fair enough.

> I think that nowadays it is OK to have a major branch that is not
> a LTS one. It has not happen in Tomcat yet, but It happens in many
> other projects.

Tomcat 8.0 was somewhat hurriedly dropped in favor of 8.5, so I think
there is definitely some precedent.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5EdEAACgkQHPApP6U8
pFh0vQ//cDFDwDiyudzJf9rHwoOjiG/IFjlm/4KtZEJlDkj4bWk/h7oex7e9VUSW
UQ6P4BrVSXfsVz0uCXj20bB+qApS+b+lGHQqEGUUT8HwZn2oByHb8WBN92QVrQ6g
rr7bOk3yHpCM0mILw1GaI6pbloroCcBVMydcqUN51BDdCqwCJqGeGZLx4NZd+BD4
ElYJCSAJP9Em44uz0S9gxbcClPLMHMt3Yq3LD7wdFimBh9EWROv4xQXGuJKHsa3A
xOilqc7XNA4E/SiqAAm7evdeBxnuB4Aijek0xWephQvQ4QMtXxVvRFOXM1Nmejsx
xJPIcYlHzJWFsjpsG7UKG57wIK3WfAEGmZut50tDTFuMxfABsqgYnbuLxUW0XTyT
l3nqVlX4CxEmNrEUVy8C2ceWIhIAKT1HAFzmL0kLwmA6wP69WUzLsVahUFeMCWuQ
fSsMoNSW+DoXjcnD0zGu0l5Vw/ewnv8SHaKMN7YrlnfyAR/wOapjGOAqTVX+MOQV
TZvPyDdA6ff9JPqByw9yRtpYKdkHTBbp/7mbRKBSTTL2+a9qn/sTEjqQHpIqJ/Bf
VmmSK0eoieem9G0tEuRzUQiaGMD6Uu7du3XYuEJCXPcO+i2YVLdDS6F921jKh/O+
CjOPBW81rTn+L0KzR3MxcSsXzUHwg1D9XqLtbbFvkJ1COW68HBQ=
=ARzV
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

37 matches

Mail list logo