Re: [VOTE] Release Apache Tomcat 9.0.21

2019-06-05 Thread Igal Sapir 

On 6/4/2019 1:50 PM, Mark Thomas wrote:

The proposed 9.0.21 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 9.0.21


+1

Igal



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

Re: [VOTE] Release Apache Tomcat 8.5.42

2019-06-05 Thread Igal Sapir 

On 6/4/2019 2:06 PM, Mark Thomas wrote:

The proposed 8.5.42 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 8.5.42


+1

Igal

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

Re: [VOTE] Release Apache Tomcat 8.5.42

2019-06-05 Thread Coty Sutherland 
On Tue, Jun 4, 2019 at 5:06 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.42 release is now available for voting.
>
> The major changes compared to the 8.5.41 release are:
>
> - Fix various concurrency and stability issues for HTTP/2.
>
> - Add support for same-site cookie attribute. Patch provided by John
>   Kelly.
>
> - Add an option to sort directory listings provided by the Default
>   Servlet.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.42/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1214/
>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.42
> 00b711f6af57e043bf4d5d64dbc1617970a54d69
>
>
> The proposed 8.5.42 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 8.5.42
>

+1


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

Re: [VOTE] Release Apache Tomcat 9.0.21

2019-06-05 Thread Coty Sutherland 
On Tue, Jun 4, 2019 at 4:50 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.21 release is now available for voting.
>
> The major changes compared to the 9.0.20 release are:
>
> - Fix various concurrency and stability issues for HTTP/2.
>
> - Add support for same-site cookie attribute. Patch provided by John
>   Kelly.
>
> - Add an option to sort directory listings provided by the Default
>   Servlet.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.21/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1213/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.21
> 5dd82367de857318b8a384c07c4414e5d55cc975
>
> The proposed 9.0.21 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 9.0.21
>

+1


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

Re: [CONF] Apache Tomcat > Troubleshooting and Diagnostics

2019-06-05 Thread Eugène Adell 
Hello,

if I may suggest something, over the years I have found very useful jstat
and GCViewer for detecting GC suspicious behaviors. Both are of course
free, the first one giving information on a live JVM, and the second being
more interesting for an offline analysis (though it can be updated
automatically). With that you can see an OOM coming, and you also can have
some clues for the heap settings if you want to tune them. You also have a
visual proof when you perform a major upgrade and want to see if it had an
impact on memory, by comparing 2 or 3 pictures before with 2 or 3 pictures
after. They were not very often mentionned in the users list, maybe they
are underrated ?

best regards
E.A.

Le mar. 4 juin 2019 à 21:00, Felix Schumacher (Confluence) <
no-re...@apache.org> a écrit :

> There's *1 new edit* on this page
>
> [image: page icon]
> 
>  Troubleshooting
> and Diagnostics
> 
> Felix Schumacher edited this page
> Here's what changed:
>
> ...
>
>- How To: Capture a thread dump
>
> 
>- How To: Capture a heap dump
>
> 
>- How To: Examine a Stacktrace
>
> 
>- How To: Configure Tomcat for debugging
>
> 
>- FAQ: Developing
>
> 
>- FAQ: Memory
>
> 
>- Tomcat Memory Leak Protection
>
> 
>- Sun Technical Article: Monitoring and Managing Java SE 6 Platform
>Applications
>
>- Notes on using JMX clients
>
> 
>
> ...
>
>- jinfo - Prints JVM process info
>
>- jstack - Prints thread stack traces
>
> 
>- jmap - Dumps heap and shows heap status
>
>- jhat - Heap Analyzer Tool
>
>- jcmd - Multitool intended to replace the above JDK tools
>
>
> Profilers & Heap Analyzers
>
>- Eclipse Memory Analyzer (MAT) 
>- YourKit Profiler 
>-
>
>VisualVM Docs
>
> 
>
>
> Anchor
> usingjmxclients
> usingjmxclients
>
> ...
>
>1. Look into Tomcat access log
>
> 
>(the log file generated by AccessLogValve
>
> ).
>
>- If your request is not listed there, then it has not been processed
>   by Tomcat. You need to look elsewhere (e.g. at your firewall).
>   - You will see what IP address your client is using, and whether it
>   is using an IPv4 (127.0.0.1) or IPv6 address (0:0:0:0:0:0:0:1).
>   Modern operating systems can use IPv6 addresses for localhost / local
>   network access, while external network is still using IPv4.
>   2. Take a thread dump
>   
> .
>   This way you will find out what Tomcat is actually doing.
>   - If you are troubleshooting some process that takes noticeable
>   time, take several (three) thread dumps with some interval between them.
>   This way you will see if there are any changes, any progress.
>   3. Try debugging
>   
> 
>   .
>   - A good place for a breakpoint is
>   org.apache.catalina.connector.CoyoteAdapter.service() method. That
>   is the

svn commit: r1860679 - in /tomcat/site/trunk: docs/bugreport.html docs/findhelp.html docs/lists.html xdocs/bugreport.xml xdocs/findhelp.xml xdocs/lists.xml

2019-06-05 Thread markt 
Author: markt
Date: Wed Jun  5 19:18:59 2019
New Revision: 1860679

URL: http://svn.apache.org/viewvc?rev=1860679=rev
Log:
More wiki changes

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/findhelp.xml
tomcat/site/trunk/xdocs/lists.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1860679=1860678=1860679=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Jun  5 19:18:59 2019
@@ -360,12 +360,13 @@ problem you are having before reporting
 
 
 Wiki  Search the
-  https://wiki.apache.org/tomcat/FrontPage;>Wiki.
+  https://cwiki.apache.org/confluence/display/TOMCAT;>Wiki.
   That is unofficial documentation to which everyone can contribute.
 
 
 
-FAQ's  Search the https://wiki.apache.org/tomcat/FAQ;>
+FAQ's  Search the
+  https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>
   Tomcat Frequently Asked Questions that is part of the Wiki.
 
 

Modified: tomcat/site/trunk/docs/findhelp.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1860679=1860678=1860679=diff
==
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Wed Jun  5 19:18:59 2019
@@ -220,9 +220,10 @@ of help are presented in the same order
 The first resource to check is the documentation. In addition to the Tomcat
 documentation (make sure you check the documentation for the version you are
 using) you should also check the relevant Servlet and/or JSP
-https://wiki.apache.org/tomcat/Specifications;>Specification 
documents.
-Much of Tomcat's behaviour is determined by these specifications and the 
information in
-them is not typically duplicated in the Tomcat documentation.
+https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications;>Specification
+documents. Much of Tomcat's behaviour is determined by these specifications and
+the information in them is not typically duplicated in the Tomcat
+documentation.
 
 
 The documentation is searchable  see input box at the top of the
@@ -242,7 +243,7 @@ favourite search engine to try and find
 
 
 Answers to very common questions are documented on the
-https://wiki.apache.org/tomcat/FAQ;>FAQ.
+https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ.
 
 
 The archives for the user mailing list are a rich source of useful
@@ -274,7 +275,8 @@ available from past Apache conferences a
 
 A list of organisations that provide support and training for Apache Tomcat
 is maintained on the
-https://wiki.apache.org/tomcat/SupportAndTraining;>Tomcat 
Wiki.
+https://cwiki.apache.org/confluence/display/TOMCAT/SupportAndTraining;>Tomcat
+Wiki.
 
 
 

Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1860679=1860678=1860679=diff
==
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Wed Jun  5 19:18:59 2019
@@ -349,9 +349,12 @@ Tomcat questions to Eric or Rick themsel
   "Tomcat 8.0" or "Tomcat 7.0" to your query to refine your results. The
   tomcat-users mailing list archives (links are below) are also 
searchable.
   
-The https://wiki.apache.org/tomcat/FAQ;>FAQ and
-  https://wiki.apache.org/tomcat/HowTo;>How To pages
-  are available at the https://wiki.apache.org/tomcat/FrontPage;>Tomcat Wiki.
+The
+  https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ and
+  https://cwiki.apache.org/confluence/display/TOMCAT/HowTo;>How To
+  pages are available at the
+  https://cwiki.apache.org/confluence/display/TOMCAT;>Tomcat
+  Wiki.
   
 Usage of these mailing lists is subject to the
   http://www.apache.org/foundation/public-archives.html;>Public Forum 
Archive Policy.

Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1860679=1860678=1860679=diff
==
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Wed Jun  5 19:18:59 2019
@@ -75,10 +75,11 @@ problem you are having before reporting
   reached Tomcat and what was Tomcat's response to them.
 
 Wiki  Search the
-  https://wiki.apache.org/tomcat/FrontPage;>Wiki.
+  https://cwiki.apache.org/confluence/display/TOMCAT;>Wiki.
   That is unofficial documentation to which everyone can contribute.
 
-FAQ's  Search the https://wiki.apache.org/tomcat/FAQ;>
+FAQ's  Search the
+

svn commit: r1860670 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

2019-06-05 Thread markt 
Author: markt
Date: Wed Jun  5 15:29:20 2019
New Revision: 1860670

URL: http://svn.apache.org/viewvc?rev=1860670=rev
Log:
Update wiki links to point to Confluence

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/conference.html
tomcat/site/trunk/docs/contact.html
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/download-taglibs.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/docs/heritage.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/docs/migration-6.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews-2010.html
tomcat/site/trunk/docs/oldnews-2011.html
tomcat/site/trunk/docs/oldnews-2012.html
tomcat/site/trunk/docs/oldnews-2013.html
tomcat/site/trunk/docs/oldnews-2014.html
tomcat/site/trunk/docs/oldnews-2015.html
tomcat/site/trunk/docs/oldnews-2016.html
tomcat/site/trunk/docs/oldnews-2017.html
tomcat/site/trunk/docs/oldnews-2018.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/docs/security-native.html
tomcat/site/trunk/docs/security-taglibs.html
tomcat/site/trunk/docs/security.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/docs/taglibs.html
tomcat/site/trunk/docs/tomcat-55-eol.html
tomcat/site/trunk/docs/tomcat-60-eol.html
tomcat/site/trunk/docs/tomcat-80-eol.html
tomcat/site/trunk/docs/tools.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/getinvolved.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/migration-8.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews-2014.xml
tomcat/site/trunk/xdocs/resources.xml
tomcat/site/trunk/xdocs/security-6.xml
tomcat/site/trunk/xdocs/security-7.xml
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/security-native.xml
tomcat/site/trunk/xdocs/stylesheets/project.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1860670=1860669=1860670=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 Tomcat Native
 
 
-https://wiki.apache.org/tomcat/FrontPage;>Wiki
+https://cwiki.apache.org/confluence/display/TOMCAT;>Wiki
 
 
 Migration Guide
@@ -120,7 +120,7 @@
 Find help
 
 
-https://wiki.apache.org/tomcat/FAQ;>FAQ
+https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ
 
 
 Mailing Lists

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1860670=1860669=1860670=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 Tomcat Native
 
 
-https://wiki.apache.org/tomcat/FrontPage;>Wiki
+https://cwiki.apache.org/confluence/display/TOMCAT;>Wiki
 
 
 Migration Guide
@@ -119,7 +119,7 @@
 Find help
 
 
-https://wiki.apache.org/tomcat/FAQ;>FAQ
+https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ
 
 
 Mailing Lists

Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1860670=1860669=1860670=diff
==
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 Tomcat Native
 
 
-https://wiki.apache.org/tomcat/FrontPage;>Wiki

[tomcat] branch 7.0.x updated: Align 7.0.x with 8.5.x. Javadoc improvements

2019-06-05 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 5c929bb  Align 7.0.x with 8.5.x. Javadoc improvements
5c929bb is described below

commit 5c929bb2fdcb3a9877cc3750b4c3c1b18247309a
Author: Mark Thomas 
AuthorDate: Wed Jun 5 12:09:37 2019 +0100

Align 7.0.x with 8.5.x. Javadoc improvements
---
 java/org/apache/tomcat/jni/Address.java|  7 ++--
 java/org/apache/tomcat/jni/Buffer.java |  2 ++
 java/org/apache/tomcat/jni/Directory.java  | 11 --
 java/org/apache/tomcat/jni/File.java   | 31 +++--
 java/org/apache/tomcat/jni/Global.java |  6 
 java/org/apache/tomcat/jni/Local.java  |  9 +++--
 java/org/apache/tomcat/jni/Lock.java   | 10 ++
 java/org/apache/tomcat/jni/Mmap.java   |  4 +++
 java/org/apache/tomcat/jni/Multicast.java  |  5 +++
 java/org/apache/tomcat/jni/OS.java |  4 +++
 java/org/apache/tomcat/jni/Poll.java   |  7 ++--
 java/org/apache/tomcat/jni/Pool.java   |  1 +
 java/org/apache/tomcat/jni/Proc.java   |  5 +++
 java/org/apache/tomcat/jni/Procattr.java   | 14 +++-
 java/org/apache/tomcat/jni/Registry.java   | 10 ++
 java/org/apache/tomcat/jni/SSL.java|  7 ++--
 java/org/apache/tomcat/jni/SSLContext.java | 22 +---
 java/org/apache/tomcat/jni/SSLSocket.java  |  9 +
 java/org/apache/tomcat/jni/Shm.java|  7 +++-
 java/org/apache/tomcat/jni/Socket.java | 56 --
 java/org/apache/tomcat/jni/Status.java |  2 +-
 java/org/apache/tomcat/jni/Stdlib.java |  6 
 java/org/apache/tomcat/jni/Thread.java |  2 +-
 java/org/apache/tomcat/jni/Time.java   | 12 +--
 java/org/apache/tomcat/jni/User.java   |  8 +
 25 files changed, 223 insertions(+), 34 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Address.java 
b/java/org/apache/tomcat/jni/Address.java
index d04be3b..6bf9ec8 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -28,12 +28,14 @@ public class Address {
  * Fill the Sockaddr class from apr_sockaddr_t
  * @param info Sockaddr class to fill
  * @param sa Structure pointer
+ * @return true if the operation was successful
  */
 public static native boolean fill(Sockaddr info, long sa);
 
 /**
  * Create the Sockaddr object from apr_sockaddr_t
  * @param sa Structure pointer
+ * @return the socket address
  */
 public static native Sockaddr getInfo(long sa);
 
@@ -59,6 +61,7 @@ public class Address {
  * 
  * @param p The pool for the apr_sockaddr_t and associated storage.
  * @return The new apr_sockaddr_t.
+ * @throws Exception Operation failed
  */
 public static native long info(String hostname, int family,
int port, int flags, long p)
@@ -93,6 +96,7 @@ public class Address {
  * @param which Which interface do we want the apr_sockaddr_t for?
  * @param sock The socket to use
  * @return The returned apr_sockaddr_t.
+ * @throws Exception An error occurred
  */
 public static native long get(int which, long sock)
 throws Exception;
@@ -104,8 +108,7 @@ public class Address {
  *
  * @param a One of the APR socket addresses.
  * @param b The other APR socket address.
- * The return value will be True if the addresses
- * are equivalent.
+ * @return true if the addresses are equal
  */
 public static native boolean equal(long a, long b);
 
diff --git a/java/org/apache/tomcat/jni/Buffer.java 
b/java/org/apache/tomcat/jni/Buffer.java
index 703bfca..b79214e 100644
--- a/java/org/apache/tomcat/jni/Buffer.java
+++ b/java/org/apache/tomcat/jni/Buffer.java
@@ -77,12 +77,14 @@ public class Buffer {
 /**
  * Returns the memory address of the ByteBuffer.
  * @param buf Previously allocated ByteBuffer.
+ * @return the memory address
  */
 public static native long address(ByteBuffer buf);
 
 /**
  * Returns the allocated memory size of the ByteBuffer.
  * @param buf Previously allocated ByteBuffer.
+ * @return the size
  */
 public static native long size(ByteBuffer buf);
 
diff --git a/java/org/apache/tomcat/jni/Directory.java 
b/java/org/apache/tomcat/jni/Directory.java
index 7c2de6e..8a94972 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -28,15 +28,18 @@ public class Directory {
  * @param path the path for the directory to be created. (use / on all 
systems)
  * @param perm Permissions for the new directory.
  * @param pool the pool to use.
+ * @return the operation result
  */
 public static native int make(String path, int perm, long pool);
 
-/** Creates a new directory on the file system, but

[CONF] Apache Tomcat > Archive

2019-06-05 Thread Mark Thomas (Confluence) 
Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Archive 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... 
 
 AJP.next  
 AJP Client Library and Command Line Tool (proposed GSoC project that was not selected) 
 Nested Filesystem  
 TomcatGrid  
 Completed These pages were used to track one-off tasks that have been completed or where work has ceased. ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 6.15.2

[CONF] Apache Tomcat > Apache Tomcat Home

2019-06-05 Thread Mark Thomas (Confluence) 
Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Apache Tomcat Home 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited at 02:35 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Populate home page  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 This is the home of the Apache Tomcat wiki space.  Contributing   Anyone is welcome to contribute to this wiki. Please create an account and then email the Tomcat Developer mailing list (you'll need to subscribed first) with your user ID and a request to be added to the wiki .   Categories   The broad categories of information in this wiki are:  
 
 Design and Development Issues  
 TomcatCon  
 Tomcat Training Course  
 FAQ  
  The majority of content in this wiki has been migration from the old Moin wiki. There are still quite a few Migrated Content waiting to be reorganised.   
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 6.15.2

[tomcat] branch master updated: Add system property to configure the loop count for most HTTP/2 tests

2019-06-05 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 4e56690  Add system property to configure the loop count for most 
HTTP/2 tests
4e56690 is described below

commit 4e566906ee74983be75111e315c6e154ed9ba66f
Author: remm 
AuthorDate: Wed Jun 5 16:37:20 2019 +0200

Add system property to configure the loop count for most HTTP/2 tests
---
 build.xml   | 1 +
 test/org/apache/coyote/http2/Http2TestBase.java | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/build.xml b/build.xml
index 6d28b3f..3370fa9 100644
--- a/build.xml
+++ b/build.xml
@@ -1607,6 +1607,7 @@
 
 
 
+
 
 
 
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index d618112..33924a6 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -57,8 +57,14 @@ import org.apache.tomcat.util.http.MimeHeaders;
  * Tests for compliance with the https://tools.ietf.org/html/rfc7540;>
  * HTTP/2 specification.
  */
+@org.junit.runner.RunWith(org.junit.runners.Parameterized.class)
 public abstract class Http2TestBase extends TomcatBaseTest {
 
+@org.junit.runners.Parameterized.Parameters
+public static Object[][] data() {
+return new Object[Integer.getInteger("tomcat.test.http2.loopCount", 
1)][0];
+}
+
 // Nothing special about this date apart from it being the date I ran the
 // test that demonstrated that most HTTP/2 tests were failing because the
 // response now included a date header


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

[CONF] Apache Tomcat > Design and Development Issues

2019-06-05 Thread Mark Thomas (Confluence) 
Title: Message Title



 
 
 
There's 2 new edits on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Design and Development Issues 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comments 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited at 02:28 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 UPdate links  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited at 02:21 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Add archive link  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... 
 
 Building the Tomcat Native Connector binaries for Windows  
 Building the isapi_redirector.dll (mod_jk) for Windows  
 Managing  Tomcat's Dependency on the Eclipse JDT Core Batch Compiler  
 Building AJP Client library and Command Line tool  
 Managing translations  
 Design Issues In progress 
 
 AJP.next  
 Removing unpackWARs  
 Nested Filesystem  
 Tomcat Grid  
  Completed  
 
 Cookies  
 
 
 http workshop 2019  
  Notes  
 
 Encoding and URIs  
 Jakarta EE TCKs  
 There is also an Archive of non-current issues.   
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 6.15.2

[CONF] Apache Tomcat > Archive

2019-06-05 Thread Mark Thomas (Confluence) 
Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Archive 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited at 02:29 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Move cookies to archive  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... These pages were used to track one-off tasks that have been completed or where work has ceased. 
 
 Cookies  
 Git migration  
 Java 9 Status tracking  
 WAR URLs  
 ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 6.15.2

[tomcat] branch master updated: Remove test loop

2019-06-05 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 06e3df0  Remove test loop
06e3df0 is described below

commit 06e3df04497b6346e4090689fe75ff69240f6b23
Author: remm 
AuthorDate: Wed Jun 5 16:06:00 2019 +0200

Remove test loop
---
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  8 
 test/org/apache/coyote/http2/TestHttp2Section_5_3.java | 10 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestAsyncFlush.java 
b/test/org/apache/coyote/http2/TestAsyncFlush.java
index 3c4373b..8de4c54 100644
--- a/test/org/apache/coyote/http2/TestAsyncFlush.java
+++ b/test/org/apache/coyote/http2/TestAsyncFlush.java
@@ -28,8 +28,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
@@ -48,14 +46,8 @@ import org.apache.catalina.startup.Tomcat;
  *   while the specification allows this to work - it doesn't require that
  *   it does work.
  */
-@RunWith(Parameterized.class)
 public class TestAsyncFlush extends Http2TestBase {
 
-@Parameterized.Parameters
-public static Object[][] data() {
-return new Object[10][0];
-}
-
 private static final int BLOCK_SIZE = 1024;
 
 @Test
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_3.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
index 64e86de..66277a7 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
@@ -18,8 +18,6 @@ package org.apache.coyote.http2;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 /**
  * Unit tests for Section 5.3 of
@@ -31,14 +29,8 @@ import org.junit.runners.Parameterized;
  * Note: Unit tests for the examples described by each of the figures may be
  * found in {@link TestAbstractStream}.
  */
-@RunWith(Parameterized.class)
 public class TestHttp2Section_5_3 extends Http2TestBase {
 
-@Parameterized.Parameters
-public static Object[][] data() {
-return new Object[10][0];
-}
-
 // Section 5.3.1
 
 @Test
@@ -172,7 +164,7 @@ public class TestHttp2Section_5_3 extends Http2TestBase {
 // on ci.apache.org so allow a margin and use 20.
 if (data[1] > 20) {
 // Larger than expected body size
-Assert.fail("Larger than expected body: [" + output.getTrace() 
+ "]");
+Assert.fail("Larger than expected body: [" + output.getTrace() 
+ "] " + data[1]);
 }
 output.clearTrace();
 }


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

buildbot success in on tomcat-7-trunk

2019-06-05 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1353

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

Buildslave for this Build: silvanus_ubuntu

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

[tomcat] branch 7.0.x updated: Fix broken back-port

2019-06-05 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 381321e  Fix broken back-port
381321e is described below

commit 381321e902b8ec3791eba27695cda1d4b4526002
Author: Mark Thomas 
AuthorDate: Wed Jun 5 11:48:41 2019 +0100

Fix broken back-port
---
 build.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.xml b/build.xml
index 69942e0..bd11b70 100644
--- a/build.xml
+++ b/build.xml
@@ -698,6 +698,8 @@
 when loading the ResourceBundles -->
 
 
+  
+

[tomcat] branch 8.5.x updated: Correct placeholder

2019-06-05 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 a04b376  Correct placeholder
a04b376 is described below

commit a04b376d576439488fc83b139c0757bbb0511388
Author: Mark Thomas 
AuthorDate: Wed Jun 5 11:51:26 2019 +0100

Correct placeholder
---
 java/org/apache/tomcat/websocket/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 22f17b7..06894a6 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -104,7 +104,7 @@ wsSession.timeout=The WebSocket session [{0}] timeout 
expired
 
 wsSession.closed=The WebSocket session [{0}] has been closed and no method 
(apart from close()) may be called on a closed session
 wsSession.created=Created WebSocket session [{0}]
-wsSession.doClose=Closing WebSocket session [{1}]
+wsSession.doClose=Closing WebSocket session [{0}]
 wsSession.duplicateHandlerBinary=A binary message handler has already been 
configured
 wsSession.duplicateHandlerPong=A pong message handler has already been 
configured
 wsSession.duplicateHandlerText=A text message handler has already been 
configured


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

buildbot exception in on tomcat-7-trunk

2019-06-05 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1352

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: exception compile upload_2

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: Increment version numbers for next development cycle

2019-06-05 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 158e61f  Increment version numbers for next development cycle
158e61f is described below

commit 158e61fce6112a37f8e7cce442c15a5f6b2a7321
Author: Mark Thomas 
AuthorDate: Wed Jun 5 10:15:05 2019 +0100

Increment version numbers for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 1bacc19..0d2ced9 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=21
+version.build=22
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 0159f06..3da7dfb 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.21
+maven.asf.release.deploy.version=9.0.22
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7154236..7f55e3d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

[tomcat] 01/03: Increment version numbers for next dev cycle

2019-06-05 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

commit b9540c8d179551fbb6305d0527a719fb389e18b3
Author: Mark Thomas 
AuthorDate: Wed Jun 5 10:16:28 2019 +0100

Increment version numbers for next dev cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index be14532..81b06b2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=42
+version.build=43
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 2f26c2b..ee1b94c 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.42
+maven.asf.release.deploy.version=8.5.43
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ebaedc5..f5be804 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


-
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 (1174ecc -> f45d77d)

2019-06-05 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 1174ecc  Clear waitFor earlier. Avoid multiple stream.notify() calls 
and timeouts
 new b9540c8  Increment version numbers for next dev cycle
 new aad1974  Switch i18n files to UTF-8. Convert to ASCII at build time.
 new f45d77d  Simplify code using varargs

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.properties.default   |   2 +-
 build.xml  |  16 +
 java/javax/el/LocalStrings.properties  |  20 +-
 java/javax/el/LocalStrings_es.properties   |  12 +-
 java/javax/servlet/LocalStrings.properties |  11 +-
 java/javax/servlet/LocalStrings_es.properties  |  13 +-
 java/javax/servlet/LocalStrings_fr.properties  |   8 +-
 java/javax/servlet/LocalStrings_ja.properties  |   6 +-
 java/javax/servlet/http/LocalStrings.properties|  12 +-
 java/javax/servlet/http/LocalStrings_es.properties |  19 +-
 java/javax/servlet/http/LocalStrings_fr.properties |  18 +-
 java/javax/servlet/http/LocalStrings_ja.properties |  20 +-
 .../catalina/authenticator/LocalStrings.properties |   8 +-
 .../authenticator/LocalStrings_es.properties   |  39 +-
 .../authenticator/LocalStrings_fr.properties   |   9 +-
 .../authenticator/LocalStrings_ja.properties   |  13 +-
 .../authenticator/jaspic/LocalStrings.properties   |   6 +-
 .../catalina/connector/LocalStrings.properties |  35 +-
 .../catalina/connector/LocalStrings_es.properties  |  87 ++-
 .../catalina/connector/LocalStrings_fr.properties  |  49 +-
 .../catalina/connector/LocalStrings_ja.properties  |  49 +-
 .../apache/catalina/core/LocalStrings.properties   | 101 +--
 .../catalina/core/LocalStrings_es.properties   | 307 -
 .../catalina/core/LocalStrings_fr.properties   | 110 ++--
 .../catalina/core/LocalStrings_ja.properties   | 158 ++---
 .../catalina/filters/LocalStrings.properties   |  42 +-
 .../catalina/filters/LocalStrings_es.properties|  40 +-
 .../catalina/filters/LocalStrings_fr.properties|   2 +-
 .../ha/authenticator/LocalStrings.properties   |   2 +-
 .../catalina/ha/context/LocalStrings.properties|   2 +-
 .../catalina/ha/deploy/LocalStrings.properties |  20 +-
 .../catalina/ha/session/LocalStrings.properties|  40 +-
 .../catalina/ha/session/LocalStrings_es.properties | 118 ++--
 .../apache/catalina/ha/tcp/LocalStrings.properties |  13 +-
 .../catalina/ha/tcp/LocalStrings_es.properties |  30 +-
 .../apache/catalina/loader/LocalStrings.properties |  46 +-
 .../catalina/loader/LocalStrings_es.properties |  59 +-
 .../catalina/loader/LocalStrings_fr.properties |  13 +-
 .../catalina/loader/LocalStrings_ja.properties |  14 +-
 .../catalina/manager/LocalStrings.properties   |  15 +-
 .../catalina/manager/LocalStrings_de.properties|  33 +-
 .../catalina/manager/LocalStrings_es.properties| 187 +++---
 .../catalina/manager/LocalStrings_fr.properties|  72 +--
 .../catalina/manager/LocalStrings_ja.properties| 129 ++--
 .../catalina/manager/LocalStrings_ru.properties| 305 +
 .../catalina/manager/host/LocalStrings.properties  |   8 +-
 .../manager/host/LocalStrings_es.properties| 132 ++--
 .../manager/host/LocalStrings_ru.properties| 134 ++--
 .../apache/catalina/mapper/LocalStrings.properties |  16 +-
 .../apache/catalina/mbeans/LocalStrings.properties |   2 +-
 .../catalina/mbeans/LocalStrings_fr.properties |  10 +-
 .../apache/catalina/realm/LocalStrings.properties  |  84 +--
 .../catalina/realm/LocalStrings_es.properties  | 131 ++--
 .../catalina/realm/LocalStrings_fr.properties  |  60 +-
 .../catalina/realm/LocalStrings_ja.properties  |  73 +--
 .../catalina/security/LocalStrings.properties  |   5 +-
 .../catalina/security/LocalStrings_es.properties   |  13 +-
 .../catalina/security/LocalStrings_fr.properties   |   3 +-
 .../catalina/security/LocalStrings_ja.properties   |   3 +-
 .../catalina/servlets/LocalStrings.properties  |  10 +-
 .../catalina/servlets/LocalStrings_es.properties   |  21 +-
 .../catalina/servlets/LocalStrings_fr.properties   |   8 +-
 .../catalina/servlets/LocalStrings_ja.properties   |  13 +-
 .../catalina/session/LocalStrings.properties   |  65 +-
 .../catalina/session/LocalStrings_es.properties|  93 +--
 .../catalina/session/LocalStrings_fr.properties|  77 +--
 .../catalina/session/LocalStrings_ja.properties|  93 +--
 .../catalina/startup/LocalStrings.properties   |  59 +-
 .../catalina/startup/LocalStrings_es.properties| 170 ++---

[tomcat] 03/03: Simplify code using varargs

2019-06-05 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

commit f45d77d1c83b2ff0badcee9b691342f4015337a2
Author: Mark Thomas 
AuthorDate: Wed Jun 5 10:42:11 2019 +0100

Simplify code using varargs
---
 java/org/apache/jasper/compiler/Localizer.java | 96 +++---
 1 file changed, 10 insertions(+), 86 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Localizer.java 
b/java/org/apache/jasper/compiler/Localizer.java
index 8fed5f2..e22803a 100644
--- a/java/org/apache/jasper/compiler/Localizer.java
+++ b/java/org/apache/jasper/compiler/Localizer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jasper.compiler;
 
 import java.text.MessageFormat;
@@ -35,11 +34,9 @@ public class Localizer {
 
 static {
 try {
-bundle = ResourceBundle.getBundle(
-"org.apache.jasper.resources.LocalStrings");
+bundle = 
ResourceBundle.getBundle("org.apache.jasper.resources.LocalStrings");
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
-t.printStackTrace();
 }
 }
 
@@ -57,7 +54,9 @@ public class Localizer {
 public static String getMessage(String errCode) {
 String errMsg = errCode;
 try {
-errMsg = bundle.getString(errCode);
+if (bundle != null) {
+errMsg = bundle.getString(errCode);
+}
 } catch (MissingResourceException e) {
 }
 return errMsg;
@@ -71,91 +70,16 @@ public class Localizer {
  * localized error messages, it is used as the error message.
  *
  * @param errCode Error code to localize
- * @param arg Argument for parametric replacement
- *
- * @return Localized error message
- */
-public static String getMessage(String errCode, String arg) {
-return getMessage(errCode, new Object[] {arg});
-}
-
-/*
- * Returns the localized error message corresponding to the given error
- * code.
- *
- * If the given error code is not defined in the resource bundle for
- * localized error messages, it is used as the error message.
- *
- * @param errCode Error code to localize
- * @param arg1 First argument for parametric replacement
- * @param arg2 Second argument for parametric replacement
- *
- * @return Localized error message
- */
-public static String getMessage(String errCode, String arg1, String arg2) {
-return getMessage(errCode, new Object[] {arg1, arg2});
-}
-
-/*
- * Returns the localized error message corresponding to the given error
- * code.
- *
- * If the given error code is not defined in the resource bundle for
- * localized error messages, it is used as the error message.
- *
- * @param errCode Error code to localize
- * @param arg1 First argument for parametric replacement
- * @param arg2 Second argument for parametric replacement
- * @param arg3 Third argument for parametric replacement
- *
- * @return Localized error message
- */
-public static String getMessage(String errCode, String arg1, String arg2,
-String arg3) {
-return getMessage(errCode, new Object[] {arg1, arg2, arg3});
-}
-
-/*
- * Returns the localized error message corresponding to the given error
- * code.
- *
- * If the given error code is not defined in the resource bundle for
- * localized error messages, it is used as the error message.
- *
- * @param errCode Error code to localize
- * @param arg1 First argument for parametric replacement
- * @param arg2 Second argument for parametric replacement
- * @param arg3 Third argument for parametric replacement
- * @param arg4 Fourth argument for parametric replacement
- *
- * @return Localized error message
- */
-public static String getMessage(String errCode, String arg1, String arg2,
-String arg3, String arg4) {
-return getMessage(errCode, new Object[] {arg1, arg2, arg3, arg4});
-}
-
-/*
- * Returns the localized error message corresponding to the given error
- * code.
- *
- * If the given error code is not defined in the resource bundle for
- * localized error messages, it is used as the error message.
- *
- * @param errCode Error code to localize
  * @param args Arguments for parametric replacement
  *
  * @return Localized error message
  */
-public static String getMessage(String errCode, Object[] args) {
-String errMsg = errCode;
-try {
-errMsg = bundle.getString(errCode);
-if (args != null && args.length > 0) {
-

Re: [VOTE] Release Apache Tomcat 8.5.42

2019-06-05 Thread Rémy Maucherat 
On Tue, Jun 4, 2019 at 11:06 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.42 release is now available for voting.
>
> The major changes compared to the 8.5.41 release are:
>
> - Fix various concurrency and stability issues for HTTP/2.
>
> - Add support for same-site cookie attribute. Patch provided by John
>   Kelly.
>
> - Add an option to sort directory listings provided by the Default
>   Servlet.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.42/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1214/
>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.42
> 00b711f6af57e043bf4d5d64dbc1617970a54d69
>
>
> The proposed 8.5.42 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.42
>
> Rémy

Back-porting i18n changes

2019-06-05 Thread Mark Thomas 
All,

One of the things I have noticed with the move to git is how easy it can
be to back-port commits. If there are no conflicts, a series of patches
can be back-ported with a few clicks. However, conflicts significantly
slow this process down. I'd like to improve that.

The short version of the plan is:

Align all three current code bases where it makes sense to do so.

The longer version of the plan is to tackle this over the medium to long
term with a combination of aligning files before making changes and
back-porting larger sets of changes.

There are a number of larger changes responsible for a reasonable chunk
of the differences. One of those is the switch to UTF-8 in the
LocalString*.properties files. I am therefore planning to back-port this
change to 8.5.x and 7.0.x.

I'm currently undecided what to do about the additional language support.

I will try and back-port the i18n improvements (mainly additional i18n
of messages).

Mark

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

Re: [VOTE] Release Apache Tomcat 8.5.42

2019-06-05 Thread Mark Thomas 
On 04/06/2019 22:06, Mark Thomas wrote:

> The proposed 8.5.42 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.42

Tests pass without failures for NIO, NIO2 and APR/native on Linux, OSX
and Windows.

Mark

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

Re: [VOTE] Release Apache Tomcat 9.0.21

2019-06-05 Thread Mark Thomas 
On 04/06/2019 21:50, Mark Thomas wrote:
> The proposed 9.0.21 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.21

Tests pass without failures for NIO, NIO2 and APR/native on Linux, OSX
and Windows.

Mark

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