[GitHub] [tomcat] Only303 closed pull request #386: 9.0.x

2020-12-09 Thread GitBox


Only303 closed pull request #386:
URL: https://github.com/apache/tomcat/pull/386


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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



[GitHub] [tomcat] Only303 closed pull request #386: 9.0.x

2020-12-09 Thread GitBox


Only303 closed pull request #386:
URL: https://github.com/apache/tomcat/pull/386


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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



[GitHub] [tomcat] Only303 opened a new pull request #386: 9.0.x

2020-12-09 Thread GitBox


Only303 opened a new pull request #386:
URL: https://github.com/apache/tomcat/pull/386


   我需要升级tomcat补丁



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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



RE: Setting up Eclipse IDE on Windows using separate CATALINA_BASE

2020-12-09 Thread jonmcalexander
Thank you!

Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com

Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020, 11/27/2020, 
12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020, 12/29/2020, 
12/30/2020, 12/31/2020
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.


> -Original Message-
> From: Konstantin Kolinko 
> Sent: Wednesday, December 9, 2020 5:16 PM
> To: Tomcat Developers List 
> Subject: Re: Setting up Eclipse IDE on Windows using separate
> CATALINA_BASE
> 
> чт, 10 дек. 2020 г. в 02:03, :
> >
> > I'm reaching out to the experts that I know of. Does anyone have a process
> for successfully configuring Eclipse IDE on Windows 10 to use Apache Tomcat
> that has a separate CATALINA_BASE from the CATALINA_HOME (Binaries)?
> 
> See the FAQ:
> https://cwiki.apache.org/confluence/display/TOMCAT/Developing
> 
> HTH
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional
> commands, e-mail: dev-h...@tomcat.apache.org



Re: Setting up Eclipse IDE on Windows using separate CATALINA_BASE

2020-12-09 Thread Konstantin Kolinko
чт, 10 дек. 2020 г. в 02:03, :
>
> I'm reaching out to the experts that I know of. Does anyone have a process 
> for successfully configuring Eclipse IDE on Windows 10 to use Apache Tomcat 
> that has a separate CATALINA_BASE from the CATALINA_HOME (Binaries)?

See the FAQ:
https://cwiki.apache.org/confluence/display/TOMCAT/Developing

HTH

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



Setting up Eclipse IDE on Windows using separate CATALINA_BASE

2020-12-09 Thread jonmcalexander
I'm reaching out to the experts that I know of. Does anyone have a process for 
successfully configuring Eclipse IDE on Windows 10 to use Apache Tomcat that 
has a separate CATALINA_BASE from the CATALINA_HOME (Binaries)?

Thanks,

Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com

Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020, 11/27/2020, 
12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020, 12/29/2020, 
12/30/2020, 12/31/2020
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.



[ANN] Apache Tomcat 8.5.61 available

2020-12-09 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.61.

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.60 include:

- Align the behaviour of ServletContext.getRealPath(String path) with
  the recent clarification from the Servlet specification project. If
  the path parameter does not start with / then Tomcat processes the
  call as if / is appended to the beginning of the provided path.

- Fix a potential file descriptor leak when WebSocket connections are
  attempted and fail. Patch provided by Maurizio Adami.

- Ensure that the LoadBalancerDrainingValve uses the correct setting
  for the secure attribute for any session cookies it creates. Based on
  a pull request by Andreas Kurth.

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



svn commit: r44900 - /release/tomcat/tomcat-8/v8.5.60/

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 16:58:18 2020
New Revision: 44900

Log:
Drop Tomcat 8.5.60 from mirrors

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


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



svn commit: r1884258 - in /tomcat/site/trunk: docs/ xdocs/

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 16:55:44 2020
New Revision: 1884258

URL: http://svn.apache.org/viewvc?rev=1884258=rev
Log:
Update site for 8.5.61 release

Modified:
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/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1884258=1884257=1884258=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Dec  9 16:55:44 2020
@@ -67,8 +67,8 @@
 
   
 Latest Stable 8.5.x Release
-2020-11-17
-8.5.60
+2020-12-08
+8.5.61
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1884258=1884257=1884258=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Dec  9 16:55:44 2020
@@ -12,7 +12,7 @@
 
   Quick Navigation
 
-[define v]8.5.60[end]
+[define v]8.5.61[end]
 https://downloads.apache.org/tomcat/tomcat-8/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1884258=1884257=1884258=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Dec  9 16:55:44 2020
@@ -53,6 +53,34 @@ changelog.
 
 https://tomcat.apache.org/download-90.cgi;>Download
 
+2020-12-08 Tomcat 8.5.61 Released
+
+The Apache Tomcat Project is proud to announce the release of version 8.5.61
+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.60 include:
+
+Align the behaviour of ServletContext.getRealPath(String path)
+with the recent clarification from the Servlet specification project. If 
the
+path parameter does not start with / then Tomcat processes the
+call as if / is appended to the beginning of the provided 
path.
+
+Fix a potential file descriptor leak when WebSocket connections are
+attempted and fail. Patch provided by Maurizio Adami.
+Ensure that the LoadBalancerDrainingValve uses the correct setting
+for the secure attribute for any session cookies it creates. Based on
+a pull request by Andreas Kurth.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8.5
+changelog.
+
+
+
+https://tomcat.apache.org/download-80.cgi;>Download
+
 beta, 
2020-12-08 Tomcat 10.0.0 Released
 
 The Apache Tomcat Project is proud to announce the release of version 10.0.0
@@ -110,29 +138,6 @@ Full details of these changes, and all t
 
 https://tomcat.apache.org/download-70.cgi;>Download
 
-2020-11-17 Tomcat 8.5.60 Released
-
-The Apache Tomcat Project is proud to announce the release of version 8.5.60
-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.59 include:
-
-Statistics are now available (via JMX) for HTTP/2, WebSocket and HTTP/1.1
-upgraded connections
-Stability improvements for HTTP/2
-Improvements to error handling in the connection pool used by the JNDI
-Realm
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8.5
-changelog.
-
-
-
-https://tomcat.apache.org/download-80.cgi;>Download
-
 2020-09-03 Tomcat Native 1.2.25 Released
 
 The Apache Tomcat Project is proud to announce the release of version 1.2.25 of

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1884258=1884257=1884258=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Wed Dec  9 16:55:44 2020
@@ -321,8 +321,9 @@ of Apache Tomcat.
 8.5.56
 8.5.57
 8.5.58
-8.5.59
-8.5.60
+8.5.59
+8.5.60
+8.5.61
 , new version:
 
 8.5.0
@@ -372,7 +373,8 @@ of Apache 

Re: [OT] Objection to the deprecation of the tomcat-native/APR connector

2020-12-09 Thread Christopher Schultz

Graham,

On 12/9/20 08:36, Graham Leggett wrote:

[Downstream use of Tomcat] is the core of the problem - gone are the
days when Tomcat was just a simple server that people downloaded and
used to make bespoke web services and could write code any way they
liked. Now Tomcat is part of other systems, who in turn have other
support horizons unrelated to this project.
Downstream consumers of Tomcat are welcome to re-integrate APR into 
their products if they choose to do so. If you are a paying customer and 
need a feature, it's up to your vendor (e.g. Atlassian) to either 
support you or lose your business.



The AJP deprecation is a problem. For those unaware of what AJP did,
AJP allowed a proxy server and Tomcat to be “glued” together as it
they were one server, and not two discrete entities. The proxy
configuration - that’s SSL, authn and authz - was passed
transparently across to Tomcat which behaved as if Tomcat itself had
performed the SSL, authn and authz. Sure, if you have a bespoke web
service and the budget you can make hack changes to compensate. If
your Tomcat is being provided by a vendor, or if you’re under
financial strain due a pandemic, then no - you have a sudden very
unwelcome headache.
Really, the only "hack" required is to enable the RemoteIPValve[1] and 
SSLValve[2]. I consider having to separately-compile and install mod_jk 
to be a "hack" at the web server level. httpd ships with mod_proxy 
already built-in.


I personally am very interested in deprecating and removing AJP from 
Tomcat for a number of reasons (lack of features, unnecessary additional 
complexity) but I continue to use AJP in production while I work to 
ensure that mod_proxy_* have feature parity with mod_jk (to wit, 
https://bz.apache.org/bugzilla/show_bug.cgi?id=64338, 
https://bz.apache.org/bugzilla/show_bug.cgi?id=53667, and possibly others).


If mod_proxy_http + Tomcat can't get the job done, let's actively work 
to fix those so they CAN get the job done.



The closest RFC compliant solution to this problem is JSON Web Tokens
(JWT), which allows data to be passed across both securely and in an
RFC compliant way over HTTP. Tomcat should have fixed this problem
first, and then deprecated AJP with the clear notice “use this
alternative in future”.
I'm not sure what you mean, here. While I suppose JWT can be used for 
just about anything anyone wants, it is typically used to package 
authentication and authorization information into a format that the user 
can be trusted to handle, rather than something that is maintained 
exclusively server-side (e.g. by passing that information from httpd -> 
Tomcat without involving the client).


Why would you involve the client here when you can pass anything you 
want directly to Tomcat via (RFC-compliant, I might add) HTTP headers?


(I notice that the "tomcatAuthentication"  attribute is 
AJP-only. That would be an obvious improvement to add that to either 
another Valve or incorporate into one of the existing proxy-support 
Valves in Tomcat.)


-chris

[1] 
http://tomcat.apache.org/tomcat-9.0-doc/config/valve.html#Remote_IP_Valve

[2] http://tomcat.apache.org/tomcat-9.0-doc/config/valve.html#SSL_Valve

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



Re: Objection to the deprecation of the tomcat-native/APR connector

2020-12-09 Thread Mladen Turk




On 09/12/2020 15:16, Mark Thomas wrote:

On 09/12/2020 13:36, Graham Leggett wrote:

On 01 Dec 2020, at 14:09, Mark Thomas  wrote:



Using APR to perform the low-level I/O creates additional risk without
little/no reward. Any performance benefits of using APR are offset
against the associated performance costs of transitioning the JNI boundary.



Although I spend endless hours creating tomcat-native, Mark is
on the spot here. Tomcat-native was designed back in times when
Java was unusable for serving 1K+ connections and APR was
lightweight package. Nowadays modern jdk can handle large
number of connections with acceptable performance, while APR
is expanding its third-party library dependencies which we
will ever need.

 Regards
--
^TM

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



svn commit: r1884254 - in /tomcat/site/trunk: ./ docs/tomcat-8.5-doc/ docs/tomcat-8.5-doc/annotationapi/ docs/tomcat-8.5-doc/annotationapi/javax/annotation/ docs/tomcat-8.5-doc/annotationapi/javax/ann

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 14:34:10 2020
New Revision: 1884254

URL: http://svn.apache.org/viewvc?rev=1884254=rev
Log:
Update docs for 8.5.61 release


[This commit notification would consist of 62 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: r44896 - /release/tomcat/tomcat-9/v9.0.40/

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 14:27:33 2020
New Revision: 44896

Log:
Drop Tomcat 9.0.40 from mirrors

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


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



svn commit: r44895 - /release/tomcat/tomcat-10/v10.0.0-M10/

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 14:27:06 2020
New Revision: 44895

Log:
Drop Tomcat 10.0.0-M10 from mirrors

Removed:
release/tomcat/tomcat-10/v10.0.0-M10/


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



[ANN] Apache Tomcat 9.0.41 available

2020-12-09 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.41.

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

- Align the behaviour of ServletContext.getRealPath(String path) with
  the recent clarification from the Servlet specification project. If
  the path parameter does not start with / then Tomcat processes the
  call as if / is appended to the beginning of the provided path.

- Fix a potential file descriptor leak when WebSocket connections are
  attempted and fail. Patch provided by Maurizio Adami.

- Ensure that the LoadBalancerDrainingValve uses the correct setting
  for the secure attribute for any session cookies it creates. Based on
  a pull request by Andreas Kurth.

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: r1884253 - in /tomcat/site/trunk: ./ docs/ xdocs/

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 14:21:04 2020
New Revision: 1884253

URL: http://svn.apache.org/viewvc?rev=1884253=rev
Log:
Update site for 9.0.41 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=1884253=1884252=1884253=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Dec  9 14:21:04 2020
@@ -38,7 +38,7 @@ tomcat.loc=https://downloads.apache.org/
 # - Tomcat versions -
 tomcat70=7.0.107
 tomcat85=8.5.60
-tomcat90=9.0.40
+tomcat90=9.0.41
 tomcat100=10.0.0
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1884253=1884252=1884253=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Dec  9 14:21:04 2020
@@ -60,8 +60,8 @@
 
   
 Latest Stable 9.0.x Release
-2020-11-17
-9.0.40
+2020-12-08
+9.0.41
   
 
 

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1884253=1884252=1884253=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Dec  9 14:21:04 2020
@@ -12,7 +12,7 @@
 
   Quick Navigation
 
-[define v]9.0.40[end]
+[define v]9.0.41[end]
 https://downloads.apache.org/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=1884253=1884252=1884253=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Dec  9 14:21:04 2020
@@ -28,6 +28,31 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2020-12-08 Tomcat 9.0.41 Released
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.41
+of Apache Tomcat. The notable changes compared to 9.0.40 include:
+
+Align the behaviour of ServletContext.getRealPath(String path)
+with the recent clarification from the Servlet specification project. If 
the
+path parameter does not start with / then Tomcat processes the
+call as if / is appended to the beginning of the provided 
path.
+
+Fix a potential file descriptor leak when WebSocket connections are
+attempted and fail. Patch provided by Maurizio Adami.
+Ensure that the LoadBalancerDrainingValve uses the correct setting
+for the secure attribute for any session cookies it creates. Based on
+a pull request by Andreas Kurth.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+https://tomcat.apache.org/download-90.cgi;>Download
+
 beta, 
2020-12-08 Tomcat 10.0.0 Released
 
 The Apache Tomcat Project is proud to announce the release of version 10.0.0
@@ -56,7 +81,7 @@ tool is under development to aid thi
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 10
+Tomcat 10
 (beta) changelog.
 
 
@@ -85,25 +110,6 @@ Full details of these changes, and all t
 
 https://tomcat.apache.org/download-70.cgi;>Download
 
-2020-11-17 Tomcat 9.0.40 Released
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.40
-of Apache Tomcat. The notable changes compared to 9.0.39 include:
-
-Statistics are now available (via JMX) for HTTP/2, WebSocket and HTTP/1.1
-upgraded connections
-Stability improvements for HTTP/2
-Stability improvements for the NIO connector
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-https://tomcat.apache.org/download-90.cgi;>Download
-
 2020-11-17 Tomcat 8.5.60 Released
 
 The Apache Tomcat Project is proud to announce the release of version 8.5.60

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 

Re: Objection to the deprecation of the tomcat-native/APR connector

2020-12-09 Thread Mark Thomas
On 09/12/2020 13:36, Graham Leggett wrote:
> On 01 Dec 2020, at 14:09, Mark Thomas  wrote:
> 
>>> I also object to the removal of OpenSSL code, for the same reason.
>>
>> It isn't being removed. The APR/Native library will be retained along
>> with OpenSSL support for the NIO and NIO2.
>>
>> I expect the scope of the APR/Native library for Tomcat 10.1.x onwards
>> will be reduced to just those native methods required to interact with
>> OpenSSL which may mean removal of the APR dependency. If we can use
>> OpenSSL without any native code of our own (e.g. via project Panama or
>> similar) then better still.
> 
> I don’t see the logic here.
> 
> If the use of native code is a risk, then I expect to see use of openssl and 
> any other API brought in by Panama avoided for the same reason?

Risk vs reward.

Using APR to perform the low-level I/O creates additional risk without
little/no reward. Any performance benefits of using APR are offset
against the associated performance costs of transitioning the JNI boundary.

For HTTP the performance difference beteeen NIO, NIO2 and APR/Native was
negligible. You could construct a test to prove any was marginally
better than the others but the differences were tiny.

The performance difference between OpenSSL and JSSE continues to be
significant. The speed at which new features are available is also a
factor. Java 8 has only just got TLS 1.3 support. Post handshake
authentication is, as far as I am aware, still unsupported. The
situation with ALPN was similar.

Using native code is not without risks but the risks are smaller if we
just wrap OpenSSL because the scope of the native code is narrower. For
HTTPS, NIO/NIO2+OpenSSL offers similar performance to APR/Native+OpenSSL
at a lower risk.

For users for whom the risk of using Native code is acceptable,
NIO/NIO2+OpenSSL offers the same benefits at lower risk compared to
APR/Native+OpenSSL.


>>> We are in the middle of a global pandemic. Our users do not have the 
>>> resources to suddenly divert to reengineering what is to them a perfectly 
>>> working system, to replace what exists with something else that just works 
>>> differently.
>>
>> Upgrading to Tomcat 10 already requires significant re-engineering work
>> due to the java package change for all the specification APIs.
>>
>> Switching an HTTP or AJP connector from APR/Native to NIO or NIO2 with
>> OpenSSL requires a change of three/four characters in one configuration
>> file. We have deliberately made it very easy to switch between connectors.
>>
>> No-one is being forced to upgrade.
> 
> Atlassian forced me to upgrade.

Then complain to Atlassian. I'd be very interested to understand
Atlassian's reasoning if they are prepared to share it.

> This is the core of the problem - gone are the days when Tomcat was just a 
> simple server that people downloaded and used to make bespoke web services 
> and could write code any way they liked. Now Tomcat is part of other systems, 
> who in turn have other support horizons unrelated to this project.
> 
> The AJP deprecation is a problem. For those unaware of what AJP did, AJP 
> allowed a proxy server and Tomcat to be “glued” together as it they were one 
> server, and not two discrete entities. The proxy configuration - that’s SSL, 
> authn and authz - was passed transparently across to Tomcat which behaved as 
> if Tomcat itself had performed the SSL, authn and authz. Sure, if you have a 
> bespoke web service and the budget you can make hack changes to compensate. 
> If your Tomcat is being provided by a vendor, or if you’re under financial 
> strain due a pandemic, then no - you have a sudden very unwelcome headache.
> 
> The closest RFC compliant solution to this problem is JSON Web Tokens (JWT), 
> which allows data to be passed across both securely and in an RFC compliant 
> way over HTTP. Tomcat should have fixed this problem first, and then 
> deprecated AJP with the clear notice “use this alternative in future”.

AJP is not deprecated. Tomcat has not deprecated support for AJP nor
announced plans to deprecate support for AJP. Tomcat has not made
feature parity with AJP a priority for the AJP alternatives because
there are no plans to deprecate AJP.

Deprecation of AJP was discussed back in 2018 but no decision was made.
Reviewing those discussions the primary motivation for deprecation
seemed to by the argument that AJP did not (and was not likely to)
provide support for features like WebSocket and encryption.

I can see the arguments for deprecating AJP now as I did then but the
size of the user base and the lack of feature parity with the mod_jk
alternatives for IIS (at least the last time I looked) means I think it
is unlikely AJP will be deprecated any time soon.

Even when we had the recent security issue with AJP (CVE-2020-1938) none
of our communication around that issue indicated that AJP was even being
considered for deprecation nor did it suggest users switched to a
different protocol.

Mark


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

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 13:43:14 2020
New Revision: 1884251

URL: http://svn.apache.org/viewvc?rev=1884251=rev
Log:
Update docs for 9.0.41 release


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



Re: Objection to the deprecation of the tomcat-native/APR connector

2020-12-09 Thread Graham Leggett
On 01 Dec 2020, at 14:09, Mark Thomas  wrote:

>> I also object to the removal of OpenSSL code, for the same reason.
> 
> It isn't being removed. The APR/Native library will be retained along
> with OpenSSL support for the NIO and NIO2.
> 
> I expect the scope of the APR/Native library for Tomcat 10.1.x onwards
> will be reduced to just those native methods required to interact with
> OpenSSL which may mean removal of the APR dependency. If we can use
> OpenSSL without any native code of our own (e.g. via project Panama or
> similar) then better still.

I don’t see the logic here.

If the use of native code is a risk, then I expect to see use of openssl and 
any other API brought in by Panama avoided for the same reason?

>> We are in the middle of a global pandemic. Our users do not have the 
>> resources to suddenly divert to reengineering what is to them a perfectly 
>> working system, to replace what exists with something else that just works 
>> differently.
> 
> Upgrading to Tomcat 10 already requires significant re-engineering work
> due to the java package change for all the specification APIs.
> 
> Switching an HTTP or AJP connector from APR/Native to NIO or NIO2 with
> OpenSSL requires a change of three/four characters in one configuration
> file. We have deliberately made it very easy to switch between connectors.
> 
> No-one is being forced to upgrade.

Atlassian forced me to upgrade.

This is the core of the problem - gone are the days when Tomcat was just a 
simple server that people downloaded and used to make bespoke web services and 
could write code any way they liked. Now Tomcat is part of other systems, who 
in turn have other support horizons unrelated to this project.

The AJP deprecation is a problem. For those unaware of what AJP did, AJP 
allowed a proxy server and Tomcat to be “glued” together as it they were one 
server, and not two discrete entities. The proxy configuration - that’s SSL, 
authn and authz - was passed transparently across to Tomcat which behaved as if 
Tomcat itself had performed the SSL, authn and authz. Sure, if you have a 
bespoke web service and the budget you can make hack changes to compensate. If 
your Tomcat is being provided by a vendor, or if you’re under financial strain 
due a pandemic, then no - you have a sudden very unwelcome headache.

The closest RFC compliant solution to this problem is JSON Web Tokens (JWT), 
which allows data to be passed across both securely and in an RFC compliant way 
over HTTP. Tomcat should have fixed this problem first, and then deprecated AJP 
with the clear notice “use this alternative in future”.

Regards,
Graham
—



svn commit: r1884250 [5/7] - /tomcat/site/trunk/docs/

2020-12-09 Thread markt
Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Old news!http://tomcat.apache.org/;>Apache 
Tomcathttps://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">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Older_news">Older news
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(beta)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentation
 Tomcat 10.0 (beta)Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apache<
 li>https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOlder news
 Announcements from previous years can be found here:
 
   year 2020

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - 
Presentationshttp://tomcat.apache.org/;>Apache 
Tomcathttps://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; 

svn commit: r1884250 [6/7] - /tomcat/site/trunk/docs/

2020-12-09 Thread markt
Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Apache Tomcat 7 
vulnerabilitieshttp://tomcat.apache.org/;>Apache 
Tomcathttps://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">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Table_of_Contents">Table of Contents
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(beta)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentation
 Tomcat 10.0 (beta)Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apache<
 li>https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
 Apache Tomcat 7.x 
vulnerabilitiesFixed in 
Apache Tomcat 7.0.105Fixed in Apache Tomcat 
7.0.104Fixed in Apache 
Tomcat 7.0.100Fixed in 
Apache Tomcat 7.0.99Fixed 
in Apache Tomcat 7.0.94Fixed in Apache Tomcat 
7.0.91Fixed in Apache 
Tomcat 7.0.90Fixed in 
Apache Tomcat 7.0.89Fixed 
in Apache Tomcat 7.0.88Fixed in Apache Tomcat 
7.0.85Fixed in Apache 
Tomca
 t 7.0.84Fixed in Apache 
Tomcat 7.0.82Fixed in 
Apache Tomcat 7.0.81Fixed 
in Apache Tomcat 7.0.79Fixed in Apache Tomcat 
7.0.78Fixed in Apache 
Tomcat 7.0.77Fixed in 
Apache Tomcat 7.0.76Fixed 
in Apache Tomcat 7.0.75Fixed in Apache Tomcat 
7.0.73Fixed in Apache 
Tomcat 7.0.72Fixed in 
Apache Tomcat 7.0.70Fixed 
in Apache Tomcat 7.0.68Fixed in Apache Tomcat
  7.0.67Fixed in Apache 
Tomcat 7.0.65Fixed in 
Apache Tomcat 

svn commit: r1884250 [7/7] - /tomcat/site/trunk/docs/

2020-12-09 Thread markt
Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Repository 
Accesshttp://tomcat.apache.org/;>Apache 
Tomcathttps://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">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Table_of_Contents">Table of Contents
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(beta)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentation
 Tomcat 10.0 (beta)Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apache<
 li>https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
 Version ControlGittomcat.gittomcat-connectors.gittomcat-native.gittomcat-training.gittomcat-taglibs-parent.gittomcat-taglibs-standard.gittomcat-taglibs-rdc.gittomcat-taglibs-site.gitSubversion RepositoryLine endings
 Version Control
 

Modified: tomcat/site/trunk/docs/taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Apache Taglibshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; 

svn commit: r1884250 [2/7] - /tomcat/site/trunk/docs/

2020-12-09 Thread markt
Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Tomcat Native 
Downloadshttp://tomcat.apache.org/;>Apache 
Tomcathttps://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-lef
 t">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Tomcat_Native_Downloads">Tomcat Native Downloads
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(beta)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentation
 Tomcat 10.0 (beta)Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apache<
 li>https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTomcat Native Downloads
 
   Use the links below to download the Apache Tomcat 
Native software
   from one of our mirrors. You must

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Apache Taglibs 
Downloadshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 

svn commit: r1884250 [4/7] - /tomcat/site/trunk/docs/

2020-12-09 Thread markt
Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/trunk/docs/oldnews-2011.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Old news! - 2011http://tomcat.apache.org/;>Apache 
Tomcathttps://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">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Other_news">Other news
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(beta)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentation
 Tomcat 10.0 (beta)Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apache<
 li>https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOther news
 Announcements from other years can be found here:
 
   year 2020

Modified: tomcat/site/trunk/docs/oldnews-2012.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/oldnews-2012.html (original)
+++ tomcat/site/trunk/docs/oldnews-2012.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Old news! - 2012http://tomcat.apache.org/;>Apache 
Tomcathttps://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; 

svn commit: r1884250 [3/7] - /tomcat/site/trunk/docs/

2020-12-09 Thread markt
Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Tomcat Maven Pluginhttp://tomcat.apache.org/;>Apache 
Tomcathttps://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">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Maven_Plugin">Maven Plugin
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(beta)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentation
 Tomcat 10.0 (beta)Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apache<
 li>https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentMaven Plugin
 
   
 The Apache Tomcat Maven Plugin provides goals to manipulate WAR

Modified: tomcat/site/trunk/docs/migration-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/migration-10.html (original)
+++ tomcat/site/trunk/docs/migration-10.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Migration Guide - Tomcat 
10.0.xhttp://tomcat.apache.org/;>Apache 
Tomcathttps://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" 

svn commit: r1884250 [1/7] - /tomcat/site/trunk/docs/

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 13:30:28 2020
New Revision: 1884250

URL: http://svn.apache.org/viewvc?rev=1884250=rev
Log:
Need to force a build to update menus

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-10.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-10.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-2019.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-10.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-70-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

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1884250=1884249=1884250=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Dec  9 13:30:28 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Reporting Bugshttp://tomcat.apache.org/;>Apache 
Tomcathttps://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">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource 

svn commit: r1884249 - /tomcat/site/trunk/xdocs/stylesheets/project.xml

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 13:29:41 2020
New Revision: 1884249

URL: http://svn.apache.org/viewvc?rev=1884249=rev
Log:
Add missed file

Modified:
tomcat/site/trunk/xdocs/stylesheets/project.xml

Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1884249=1884248=1884249=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/project.xml (original)
+++ tomcat/site/trunk/xdocs/stylesheets/project.xml Wed Dec  9 13:29:41 2020
@@ -18,7 +18,7 @@
 -->
 
 
-
+
 
 
 
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 



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



[ANN] Apache Tomcat 10.0.0 (beta) available

2020-12-09 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 10.0.0 (beta).

Apache Tomcat 10 is an open source software implementation of the
Jakarta Servlet, Jakarta Server Pages, Jakarta Expression Language,
Jakarta WebSocket, Jakarta Authentication and Jakarta Annotations
specifications.

Users of Tomcat 10 onwards should be aware that, as a result of the move
from Java EE to Jakarta EE as part of the transfer of Java EE to the
Eclipse Foundation, the primary package for all implemented APIs has
changed from javax.* to jakarta.*. This will almost certainly require
code changes to enable applications to migrate from Tomcat 9 and earlier
to Tomcat 10 and later. A migration tool is under development to aid
this process.

Apache Tomcat 10.0.0 (beta) is a beta release of the 10.0.x
branch. The notable changes compared to 10.0.0-M10 include:

- The Jakarta EE specifications are now final. Tomcat passes the TCKs
  apart from a number of expected failures that don't impact
  specification compliance.

- The APR/Native AJP and HTTP connectors have been deprecated.
  Tomcat Native will continue to be used to support OpenSSL use with NIO
  and NIO2.

- Align the behaviour of ServletContext.getRealPath(String path) with
  the recent clarification from the Servlet specification project. If
  the path parameter does not start with / then Tomcat processes the
  call as if / is appended to the beginning of the provided path.

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

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

Migration guides from Apache Tomcat 7.0.x, 8.5.x and 9.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



[tomcat] branch master updated: Update version numbers

2020-12-09 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 630adb6  Update version numbers
630adb6 is described below

commit 630adb6272beb02cd709465441e841f2d362b6fb
Author: remm 
AuthorDate: Wed Dec 9 14:18:23 2020 +0100

Update version numbers
---
 modules/owb/pom.xml |  2 +-
 modules/stuffed/pom.xml | 12 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index b8a88eb..619e55a 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -36,7 +36,7 @@
 1.2
 1.2
 1.3
-10.0.0-M10
+10.0.0
 
 
 
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index 6d0b6b6..a46dad5 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -29,8 +29,8 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-10.0.0-M10
-
+10.0.0
+
 
 
 
@@ -95,6 +95,14 @@
 
 
 
false
+
+
+*:*
+
+module-info.class
+
+
+
 
 
 


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



svn commit: r1884246 - in /tomcat/site/trunk/docs: ./ tomcat-10.0-doc/ tomcat-10.0-doc/annotationapi/ tomcat-10.0-doc/annotationapi/jakarta/annotation/ tomcat-10.0-doc/annotationapi/jakarta/annotation

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 13:01:00 2020
New Revision: 1884246

URL: http://svn.apache.org/viewvc?rev=1884246=rev
Log:
Update Tomcat 10 docs for 10.0.0 release


[This commit notification would consist of 82 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: r1884247 - in /tomcat/site/trunk: ./ xdocs/

2020-12-09 Thread markt
Author: markt
Date: Wed Dec  9 13:01:36 2020
New Revision: 1884247

URL: http://svn.apache.org/viewvc?rev=1884247=rev
Log:
Update site for 10.0.0 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/ci.xml
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-10.xml
tomcat/site/trunk/xdocs/migration.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/security-10.xml
tomcat/site/trunk/xdocs/source.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=1884247=1884246=1884247=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Dec  9 13:01:36 2020
@@ -39,7 +39,7 @@ tomcat.loc=https://downloads.apache.org/
 tomcat70=7.0.107
 tomcat85=8.5.60
 tomcat90=9.0.40
-tomcat100=10.0.0-M10
+tomcat100=10.0.0
 
 # - Download destination -
 tomcat-site-docs.home=${base.path}/tomcat-site-docs/

Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1884247=1884246=1884247=diff
==
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Wed Dec  9 13:01:36 2020
@@ -144,7 +144,7 @@ problem you are having before reporting
 Here is a quick list of supported products:
 
  Tomcat 10, Tomcat 9, Tomcat 8 and Tomcat 
7
-  Tomcat 10.0.x alpha, Tomcat 
9.0.x, 8.5.x and 7.0.x
+  Tomcat 10.0.x beta, Tomcat 
9.0.x, 8.5.x and 7.0.x
  Tomcat Connectors  Integration of Tomcat with 
other Web servers
  Tomcat Native  APR based native HTTP and AJP 
connectors for Tomcat
  Tomcat Modules  Additional Tomcat components
@@ -199,7 +199,7 @@ problem you are having before reporting
 
 
 
-  Tomcat 10.0 alpha (master)
+  Tomcat 10.0 beta (master)
   
 https://tomcat.apache.org/tomcat-10.0-doc/changelog.html;>changelog.html
   
@@ -343,7 +343,7 @@ bug in your web application.
   
 Product. Here is a list of supported products:
 
- Tomcat 10 alpha  Tomcat 10.0.x and 
tomcat.apache.org web site
+ Tomcat 10 beta  Tomcat 10.0.x and 
tomcat.apache.org web site
  Tomcat 9  Tomcat 9.0.x
  Tomcat 8  Tomcat 8.5.x
  Tomcat 7  Tomcat 7.0.x

Modified: tomcat/site/trunk/xdocs/ci.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1884247=1884246=1884247=diff
==
--- tomcat/site/trunk/xdocs/ci.xml (original)
+++ tomcat/site/trunk/xdocs/ci.xml Wed Dec  9 13:01:36 2020
@@ -37,7 +37,7 @@ currently developed not yet released ver
 prepared and published by ASF Buildbot, using the latest source code.
 
 
-  http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html; 
rel="nofollow">Tomcat 10.0.x alpha (master)
+  http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html; 
rel="nofollow">Tomcat 10.0.x beta (master)
   http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html; 
rel="nofollow">Tomcat 9.0.x
   http://ci.apache.org/projects/tomcat/tomcat85/docs/index.html; 
rel="nofollow">Tomcat 8.5.x
   http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html; 
rel="nofollow">Tomcat 7.0.x
@@ -140,7 +140,7 @@ prepared and published by ASF Buildbot,
 
 
 
-  http://vmgump.apache.org/tomcat-trunk/;>tomcat-trunkTomcat 
10.0.x alpha
+  http://vmgump.apache.org/tomcat-trunk/;>tomcat-trunkTomcat 
10.0.x beta
   
 
   Source path: https://github.com/apache/tomcat;>https://github.com/apache/tomcat

Modified: tomcat/site/trunk/xdocs/download-10.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-10.xml?rev=1884247=1884246=1884247=diff
==
--- tomcat/site/trunk/xdocs/download-10.xml (original)
+++ tomcat/site/trunk/xdocs/download-10.xml Wed Dec  9 13:01:36 2020
@@ -8,7 +8,7 @@
   
 Welcome to the Apache Tomcat 10.x software download
 page. This page provides download links for obtaining the latest version of
-Tomcat 10.0.x alpha software, as well as links to the archives 
of older releases.
+Tomcat 10.0.x beta software, as well as links to the archives 
of older releases.
 
 Unsure which version you need? Specification versions implemented,
 minimum Java version required and lots more useful information may be found
@@ -31,7 +31,7 @@
  Define variable to hold the current version number.
  Documentation for ezt.py: https://code.google.com/p/ezt/wiki/Syntax
 -->
-[define v]10.0.0-M10[end]

Re: [GitHub] [tomcat] rainerjung opened a new pull request #385: Add peerAddress to coyote request

2020-12-09 Thread Rainer Jung

Hi all,

I plan to integrate this PR. I adressed the comments of Martin except 
for the constants name casing, which I wanted to keep conskistent in the 
file for now.


If anyone needs more time to review, please let me know. Any feedback 
highly welcome.


Since IMHO it is useful for all branches, I would also backport it.

Thanks and regards,

Rainer

Am 06.12.2020 um 16:20 schrieb GitBox:


rainerjung opened a new pull request #385:
URL: https://github.com/apache/tomcat/pull/385


It contains the IP address of the direct connection peer.
If a reverse proxy sits in front of Tomcat and the protocol
used is AJP or HTTP in combination with the RemoteIp(Valve|Filter),
the peer address might differ from the remoteAddress.
The latter then contains the address of the client in front of the
reverse proxy, not the address of the proxy itself.

Support for the peer address has been added to the

RemoteAddrValve and RemoteCIDRValve with the new attribute
"usePeerAddress". This can be used to restrict access
to Tomcat bsed on the reverse proxy IP address, which is especially
useful to harden access to AJP connecrtors.

The peer address can also be logged in the access log

using the new %{peer}a syntax.


-
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: Micro optimization: Use String#[last]indexOf(int) instead of #indexOf(String) where possible

2020-12-09 Thread mgrigorov
This is an automated email from the ASF dual-hosted git repository.

mgrigorov 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 70421ec  Micro optimization: Use String#[last]indexOf(int) instead of 
#indexOf(String) where possible
70421ec is described below

commit 70421ec208ea723da67b8007235328cba48b43be
Author: Martin Tzvetanov Grigorov 
AuthorDate: Wed Dec 9 10:59:10 2020 +0200

Micro optimization: Use String#[last]indexOf(int) instead of 
#indexOf(String) where possible

(cherry picked from commit f41c7d91e2d33f4d09254f7a46df63960238bbc4)
---
 java/org/apache/catalina/mbeans/MBeanDumper.java| 6 --
 java/org/apache/catalina/util/NetMask.java  | 4 ++--
 java/org/apache/catalina/valves/RemoteCIDRValve.java| 2 +-
 java/org/apache/catalina/valves/rewrite/ResolverImpl.java   | 2 +-
 java/org/apache/catalina/valves/rewrite/RewriteValve.java   | 2 +-
 java/org/apache/jasper/servlet/JspCServletContext.java  | 2 +-
 .../tomcat/util/http/fileupload/util/mime/RFC2231Utility.java   | 4 ++--
 java/org/apache/tomcat/util/modeler/Registry.java   | 4 ++--
 java/org/apache/tomcat/util/net/IPv6Utils.java  | 4 ++--
 test/org/apache/coyote/http11/TestHttp11InputBufferCRLF.java| 4 ++--
 10 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/MBeanDumper.java 
b/java/org/apache/catalina/mbeans/MBeanDumper.java
index 83a43a0..23377ac 100644
--- a/java/org/apache/catalina/mbeans/MBeanDumper.java
+++ b/java/org/apache/catalina/mbeans/MBeanDumper.java
@@ -158,8 +158,10 @@ public class MBeanDumper {
 // The only invalid char is \n
 // We also need to keep the string short and split it with \nSPACE
 // XXX TODO
-int idx=value.indexOf( "\n" );
-if( idx < 0 ) return value;
+int idx = value.indexOf('\n');
+if (idx < 0) {
+return value;
+}
 
 int prev=0;
 StringBuilder sb=new StringBuilder();
diff --git a/java/org/apache/catalina/util/NetMask.java 
b/java/org/apache/catalina/util/NetMask.java
index fa34065..bdad9f9 100644
--- a/java/org/apache/catalina/util/NetMask.java
+++ b/java/org/apache/catalina/util/NetMask.java
@@ -96,7 +96,7 @@ public final class NetMask {
 
 expression = input;
 
-final int portIdx = input.indexOf(";");
+final int portIdx = input.indexOf(';');
 final String nonPortPart;
 
 if (portIdx == -1) {
@@ -116,7 +116,7 @@ public final class NetMask {
 }
 }
 
-final int idx = nonPortPart.indexOf("/");
+final int idx = nonPortPart.indexOf('/');
 
 /*
  * Handle the "IP only" case first
diff --git a/java/org/apache/catalina/valves/RemoteCIDRValve.java 
b/java/org/apache/catalina/valves/RemoteCIDRValve.java
index 0675679..0bdf450 100644
--- a/java/org/apache/catalina/valves/RemoteCIDRValve.java
+++ b/java/org/apache/catalina/valves/RemoteCIDRValve.java
@@ -140,7 +140,7 @@ public final class RemoteCIDRValve extends 
RequestFilterValve {
 @Override
 public boolean isAllowed(final String property) {
 
-final int portIdx = property.indexOf(";");
+final int portIdx = property.indexOf(';');
 final int port;
 final String nonPortPart;
 
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index f4c38e1..a909b5c 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -276,7 +276,7 @@ public class ResolverImpl extends Resolver {
 StringTokenizer tokenizer = new StringTokenizer(fullDN, ",");
 while (tokenizer.hasMoreElements()) {
 String token = tokenizer.nextToken().trim();
-int pos = token.indexOf("=");
+int pos = token.indexOf('=');
 if (pos > 0 && (pos + 1) < token.length()) {
 components.put(token.substring(0, pos), token.substring(pos + 
1));
 }
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 88f17f3..3266092 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -380,7 +380,7 @@ public class RewriteValve extends ValveBase {
 // Append the query string to the url if there is one and 
it
 // hasn't been rewritten
 String urlStringDecoded = urlDecoded.toString();
-int index = urlStringDecoded.indexOf("?");
+int index = urlStringDecoded.indexOf('?');
 String 

[tomcat] branch 9.0.x updated: Micro optimization: Use String#[last]indexOf(int) instead of #indexOf(String) where possible

2020-12-09 Thread mgrigorov
This is an automated email from the ASF dual-hosted git repository.

mgrigorov 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 1d55b74  Micro optimization: Use String#[last]indexOf(int) instead of 
#indexOf(String) where possible
1d55b74 is described below

commit 1d55b740aeebd3e21e66c2bbd05e05aa39cfca0d
Author: Martin Tzvetanov Grigorov 
AuthorDate: Wed Dec 9 10:59:10 2020 +0200

Micro optimization: Use String#[last]indexOf(int) instead of 
#indexOf(String) where possible

(cherry picked from commit f41c7d91e2d33f4d09254f7a46df63960238bbc4)
---
 java/org/apache/catalina/mbeans/MBeanDumper.java  | 2 +-
 java/org/apache/catalina/util/NetMask.java| 4 ++--
 java/org/apache/catalina/valves/RemoteCIDRValve.java  | 2 +-
 java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 2 +-
 java/org/apache/catalina/valves/rewrite/RewriteValve.java | 2 +-
 java/org/apache/jasper/servlet/JspCServletContext.java| 2 +-
 .../apache/tomcat/util/http/fileupload/util/mime/RFC2231Utility.java  | 4 ++--
 java/org/apache/tomcat/util/modeler/Registry.java | 4 ++--
 java/org/apache/tomcat/util/net/IPv6Utils.java| 4 ++--
 test/org/apache/coyote/http11/TestHttp11InputBufferCRLF.java  | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/MBeanDumper.java 
b/java/org/apache/catalina/mbeans/MBeanDumper.java
index a6a..8949f25 100644
--- a/java/org/apache/catalina/mbeans/MBeanDumper.java
+++ b/java/org/apache/catalina/mbeans/MBeanDumper.java
@@ -159,7 +159,7 @@ public class MBeanDumper {
 // The only invalid char is \n
 // We also need to keep the string short and split it with \nSPACE
 // XXX TODO
-int idx = value.indexOf("\n");
+int idx = value.indexOf('\n');
 if (idx < 0) {
 return value;
 }
diff --git a/java/org/apache/catalina/util/NetMask.java 
b/java/org/apache/catalina/util/NetMask.java
index fa34065..bdad9f9 100644
--- a/java/org/apache/catalina/util/NetMask.java
+++ b/java/org/apache/catalina/util/NetMask.java
@@ -96,7 +96,7 @@ public final class NetMask {
 
 expression = input;
 
-final int portIdx = input.indexOf(";");
+final int portIdx = input.indexOf(';');
 final String nonPortPart;
 
 if (portIdx == -1) {
@@ -116,7 +116,7 @@ public final class NetMask {
 }
 }
 
-final int idx = nonPortPart.indexOf("/");
+final int idx = nonPortPart.indexOf('/');
 
 /*
  * Handle the "IP only" case first
diff --git a/java/org/apache/catalina/valves/RemoteCIDRValve.java 
b/java/org/apache/catalina/valves/RemoteCIDRValve.java
index 319ed78..120564d 100644
--- a/java/org/apache/catalina/valves/RemoteCIDRValve.java
+++ b/java/org/apache/catalina/valves/RemoteCIDRValve.java
@@ -141,7 +141,7 @@ public final class RemoteCIDRValve extends 
RequestFilterValve {
 @Override
 public boolean isAllowed(final String property) {
 
-final int portIdx = property.indexOf(";");
+final int portIdx = property.indexOf(';');
 final int port;
 final String nonPortPart;
 
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 01afcff..8e925dc 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -287,7 +287,7 @@ public class ResolverImpl extends Resolver {
 StringTokenizer tokenizer = new StringTokenizer(fullDN, ",");
 while (tokenizer.hasMoreElements()) {
 String token = tokenizer.nextToken().trim();
-int pos = token.indexOf("=");
+int pos = token.indexOf('=');
 if (pos > 0 && (pos + 1) < token.length()) {
 components.put(token.substring(0, pos), token.substring(pos + 
1));
 }
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index e0f1c04..459214a 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -364,7 +364,7 @@ public class RewriteValve extends ValveBase {
 // Append the query string to the url if there is one and 
it
 // hasn't been rewritten
 String urlStringDecoded = urlDecoded.toString();
-int index = urlStringDecoded.indexOf("?");
+int index = urlStringDecoded.indexOf('?');
 String rewrittenQueryStringDecoded;
 if (index == -1) {
 

[tomcat] branch master updated: Micro optimization: Use String#[last]indexOf(int) instead of #indexOf(String) where possible

2020-12-09 Thread mgrigorov
This is an automated email from the ASF dual-hosted git repository.

mgrigorov 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 f41c7d9  Micro optimization: Use String#[last]indexOf(int) instead of 
#indexOf(String) where possible
f41c7d9 is described below

commit f41c7d91e2d33f4d09254f7a46df63960238bbc4
Author: Martin Tzvetanov Grigorov 
AuthorDate: Wed Dec 9 10:59:10 2020 +0200

Micro optimization: Use String#[last]indexOf(int) instead of 
#indexOf(String) where possible
---
 java/org/apache/catalina/mbeans/MBeanDumper.java  | 2 +-
 java/org/apache/catalina/util/NetMask.java| 4 ++--
 java/org/apache/catalina/valves/RemoteCIDRValve.java  | 2 +-
 java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 2 +-
 java/org/apache/catalina/valves/rewrite/RewriteValve.java | 2 +-
 java/org/apache/jasper/servlet/JspCServletContext.java| 2 +-
 .../apache/tomcat/util/http/fileupload/util/mime/RFC2231Utility.java  | 4 ++--
 java/org/apache/tomcat/util/modeler/Registry.java | 4 ++--
 java/org/apache/tomcat/util/net/IPv6Utils.java| 4 ++--
 test/org/apache/coyote/http11/TestHttp11InputBufferCRLF.java  | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/MBeanDumper.java 
b/java/org/apache/catalina/mbeans/MBeanDumper.java
index a6a..8949f25 100644
--- a/java/org/apache/catalina/mbeans/MBeanDumper.java
+++ b/java/org/apache/catalina/mbeans/MBeanDumper.java
@@ -159,7 +159,7 @@ public class MBeanDumper {
 // The only invalid char is \n
 // We also need to keep the string short and split it with \nSPACE
 // XXX TODO
-int idx = value.indexOf("\n");
+int idx = value.indexOf('\n');
 if (idx < 0) {
 return value;
 }
diff --git a/java/org/apache/catalina/util/NetMask.java 
b/java/org/apache/catalina/util/NetMask.java
index fa34065..bdad9f9 100644
--- a/java/org/apache/catalina/util/NetMask.java
+++ b/java/org/apache/catalina/util/NetMask.java
@@ -96,7 +96,7 @@ public final class NetMask {
 
 expression = input;
 
-final int portIdx = input.indexOf(";");
+final int portIdx = input.indexOf(';');
 final String nonPortPart;
 
 if (portIdx == -1) {
@@ -116,7 +116,7 @@ public final class NetMask {
 }
 }
 
-final int idx = nonPortPart.indexOf("/");
+final int idx = nonPortPart.indexOf('/');
 
 /*
  * Handle the "IP only" case first
diff --git a/java/org/apache/catalina/valves/RemoteCIDRValve.java 
b/java/org/apache/catalina/valves/RemoteCIDRValve.java
index 4565c71..06cd548 100644
--- a/java/org/apache/catalina/valves/RemoteCIDRValve.java
+++ b/java/org/apache/catalina/valves/RemoteCIDRValve.java
@@ -141,7 +141,7 @@ public final class RemoteCIDRValve extends 
RequestFilterValve {
 @Override
 public boolean isAllowed(final String property) {
 
-final int portIdx = property.indexOf(";");
+final int portIdx = property.indexOf(';');
 final int port;
 final String nonPortPart;
 
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 01afcff..8e925dc 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -287,7 +287,7 @@ public class ResolverImpl extends Resolver {
 StringTokenizer tokenizer = new StringTokenizer(fullDN, ",");
 while (tokenizer.hasMoreElements()) {
 String token = tokenizer.nextToken().trim();
-int pos = token.indexOf("=");
+int pos = token.indexOf('=');
 if (pos > 0 && (pos + 1) < token.length()) {
 components.put(token.substring(0, pos), token.substring(pos + 
1));
 }
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 9c76061..9277e3c 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -364,7 +364,7 @@ public class RewriteValve extends ValveBase {
 // Append the query string to the url if there is one and 
it
 // hasn't been rewritten
 String urlStringDecoded = urlDecoded.toString();
-int index = urlStringDecoded.indexOf("?");
+int index = urlStringDecoded.indexOf('?');
 String rewrittenQueryStringDecoded;
 if (index == -1) {
 rewrittenQueryStringDecoded = null;
diff --git 

Re: Snapshot published for Jakarta EE migration tool

2020-12-09 Thread Martin Grigorov
On Tue, Dec 8, 2020 at 8:13 PM Martin Grigorov  wrote:

>
>
> On Tue, Dec 8, 2020, 19:13 Mark Thomas  wrote:
>
>> On 01/12/2020 17:09, Mark Thomas wrote:
>> > Hi all,
>> >
>> > I've just published the following snapshot:
>> >
>> >
>> https://repository.apache.org/content/groups/snapshots/org/apache/tomcat/jakartaee-migration/0.1.0-SNAPSHOT/
>> >
>> > This isn't a formal RC as I am expecting there to be some issues. Please
>> > take a look and report any issues back to this thread.
>> >
>> > I hope to clean things up and be in a position to start a formal release
>> > vote late this week / early next.
>>
>> Ping. Anyone found any issues?
>>
>
> I've built the latest master to test 10.0.0 and migrated Apache Wicket 9.x
> examples.
> I will re-test tomorrow with the jar from Maven!
>

https://repository.apache.org/content/groups/snapshots/org/apache/tomcat/jakartaee-migration/0.1.0-SNAPSHOT/jakartaee-migration-0.1.0-20201201.170558-1-shaded.jar
works just fine !


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