[GitHub] [tomcat] biya-bi opened a new pull request #266: Fix typo in exception message about quote character in repository path

[GitBox]

biya-bi opened a new pull request #266: Fix typo in exception message about 
quote character in repository path
URL: https://github.com/apache/tomcat/pull/266
 
 
   This is a very small commit that corrects a typo in the message of the
   exception thrown when a quote character is used in path representing a
   repository.


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


With regards,
Apache Git Services

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

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 4d5048f9826627ad9f80627bf28ff7b15bd489ac
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 master updated (f6d471f -> 4d5048f)

[markt]

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

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


from f6d471f  Remove reloadable attribute from Loader (it is duplicated on 
Context)
 new b248604  Remove additional work-around for old Adobe REader bug
 new 4d5048f  Update unit tests now space is not inserted.

The 2 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:
 java/org/apache/tomcat/util/http/parser/MediaType.java |  4 
 test/org/apache/tomcat/util/http/parser/TestMediaType.java | 12 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)


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

[tomcat] 01/02: Remove additional work-around for old Adobe REader bug

[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

commit b248604987681e0c9b1a8e36217624e8560f1c02
Author: Mark Thomas 
AuthorDate: Fri Apr 3 21:11:30 2020 +0100

Remove additional work-around for old Adobe REader bug
---
 java/org/apache/tomcat/util/http/parser/MediaType.java | 4 
 1 file changed, 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java 
b/java/org/apache/tomcat/util/http/parser/MediaType.java
index 2c548c0..52203cf 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -103,10 +103,6 @@ public class MediaType {
 continue;
 }
 result.append(';');
-// Workaround for Adobe Read 9 plug-in on IE bug
-// Can be removed after 26 June 2013 (EOL of Reader 9)
-// See BZ 53814
-result.append(' ');
 result.append(entry.getKey());
 result.append('=');
 result.append(entry.getValue());


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

[tomcat] 02/02: Update unit tests now space is not inserted.

[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

commit 4d5048f9826627ad9f80627bf28ff7b15bd489ac
Author: Mark Thomas 
AuthorDate: Fri Apr 3 21:12:27 2020 +0100

Update unit tests now space is not inserted.
---
 test/org/apache/tomcat/util/http/parser/TestMediaType.java | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/tomcat/util/http/parser/TestMediaType.java 
b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
index 06c234e..6f16f14 100644
--- a/test/org/apache/tomcat/util/http/parser/TestMediaType.java
+++ b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
@@ -142,9 +142,9 @@ public class TestMediaType {
 StringReader sr = new StringReader(sb.toString());
 MediaType m = MediaType.parseMediaType(sr);
 
-Assert.assertEquals("foo/bar; charset=UTF-8; a=b", m.toString());
+Assert.assertEquals("foo/bar;charset=UTF-8;a=b", m.toString());
 Assert.assertEquals(CHARSET, m.getCharset());
-Assert.assertEquals("foo/bar; a=b", m.toStringNoCharset());
+Assert.assertEquals("foo/bar;a=b", m.toStringNoCharset());
 }
 
 
@@ -184,8 +184,8 @@ public class TestMediaType {
 Assert.assertEquals("\"application/smil;charset=UTF-8\"",
 m.getParameterValue("Type"));
 
-String expected = "multipart/related; boundary=1_4F50BD36_CDF8C28; " +
-"start=\"<31671603.smil>\"; " +
+String expected = "multipart/related;boundary=1_4F50BD36_CDF8C28;" +
+"start=\"<31671603.smil>\";" +
 "type=\"application/smil;charset=UTF-8\"";
 Assert.assertEquals(expected, m.toString());
 Assert.assertEquals(expected, m.toStringNoCharset());
@@ -211,7 +211,7 @@ public class TestMediaType {
 Assert.assertEquals("UTF-8", m.getCharset());
 
 // Note: Invalid input is filtered out
-Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+Assert.assertEquals("text/html;charset=UTF-8", m.toString());
 Assert.assertEquals("UTF-8", m.getCharset());
 }
 
@@ -231,7 +231,7 @@ public class TestMediaType {
 Assert.assertEquals("UTF-8", m.getParameterValue("charset"));
 Assert.assertEquals("UTF-8", m.getCharset());
 
-Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+Assert.assertEquals("text/html;charset=UTF-8", m.toString());
 }
 
 


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

[tomcat] branch master updated: Remove reloadable attribute from Loader (it is duplicated on Context)

[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 f6d471f  Remove reloadable attribute from Loader (it is duplicated on 
Context)
f6d471f is described below

commit f6d471f6ff69a5f3da00cd8f8216b4c513ca069f
Author: Mark Thomas 
AuthorDate: Fri Apr 3 20:56:48 2020 +0100

Remove reloadable attribute from Loader (it is duplicated on Context)
---
 java/org/apache/catalina/Loader.java   | 14 
 java/org/apache/catalina/loader/WebappLoader.java  | 95 +++---
 .../apache/catalina/loader/mbeans-descriptors.xml  |  4 -
 .../startup/TestContextConfigAnnotation.java   |  4 -
 webapps/docs/changelog.xml |  5 ++
 webapps/docs/config/loader.xml | 17 
 6 files changed, 15 insertions(+), 124 deletions(-)

diff --git a/java/org/apache/catalina/Loader.java 
b/java/org/apache/catalina/Loader.java
index dfe2461..66c080d 100644
--- a/java/org/apache/catalina/Loader.java
+++ b/java/org/apache/catalina/Loader.java
@@ -95,20 +95,6 @@ public interface Loader {
 
 
 /**
- * @return the reloadable flag for this Loader.
- */
-public boolean getReloadable();
-
-
-/**
- * Set the reloadable flag for this Loader.
- *
- * @param reloadable The new reloadable flag
- */
-public void setReloadable(boolean reloadable);
-
-
-/**
  * Add a property change listener to this component.
  *
  * @param listener The listener to add
diff --git a/java/org/apache/catalina/loader/WebappLoader.java 
b/java/org/apache/catalina/loader/WebappLoader.java
index 2727a31..03c738b 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -16,7 +16,6 @@
  */
 package org.apache.catalina.loader;
 
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
@@ -62,8 +61,7 @@ import org.apache.tomcat.util.res.StringManager;
  * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
-public class WebappLoader extends LifecycleMBeanBase
-implements Loader, PropertyChangeListener {
+public class WebappLoader extends LifecycleMBeanBase implements Loader{
 
 private static final Log log = LogFactory.getLog(WebappLoader.class);
 
@@ -97,12 +95,6 @@ public class WebappLoader extends LifecycleMBeanBase
 
 
 /**
- * The reloadable flag for this Loader.
- */
-private boolean reloadable = false;
-
-
-/**
  * The string manager for this package.
  */
 protected static final StringManager sm = 
StringManager.getManager(WebappLoader.class);
@@ -145,25 +137,13 @@ public class WebappLoader extends LifecycleMBeanBase
 }
 
 if (getState().isAvailable()) {
-throw new IllegalStateException(
-sm.getString("webappLoader.setContext.ise"));
-}
-
-// Deregister from the old Context (if any)
-if (this.context != null) {
-this.context.removePropertyChangeListener(this);
+throw new 
IllegalStateException(sm.getString("webappLoader.setContext.ise"));
 }
 
 // Process this property change
 Context oldContext = this.context;
 this.context = context;
 support.firePropertyChange("context", oldContext, this.context);
-
-// Register with the new Container (if any)
-if (this.context != null) {
-setReloadable(this.context.getReloadable());
-this.context.addPropertyChangeListener(this);
-}
 }
 
 
@@ -210,31 +190,6 @@ public class WebappLoader extends LifecycleMBeanBase
 }
 
 
-/**
- * Return the reloadable flag for this Loader.
- */
-@Override
-public boolean getReloadable() {
-return this.reloadable;
-}
-
-
-/**
- * Set the reloadable flag for this Loader.
- *
- * @param reloadable The new reloadable flag
- */
-@Override
-public void setReloadable(boolean reloadable) {
-// Process this property change
-boolean oldReloadable = this.reloadable;
-this.reloadable = reloadable;
-support.firePropertyChange("reloadable",
-   Boolean.valueOf(oldReloadable),
-   Boolean.valueOf(this.reloadable));
-}
-
-
 // - Public Methods
 
 /**
@@ -257,17 +212,15 @@ public class WebappLoader extends LifecycleMBeanBase
  */
 @Override
 public void backgroundProcess() {
-if (reloadable && modified()) {
-try {
-Thread.currentThread().setContextClassLoader
-(WebappLoader.class.getClassLoader());
-if (context != 

[tomcat] branch 9.0.x updated: Deprecate Loader#reloadable

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 07fac81  Deprecate Loader#reloadable
07fac81 is described below

commit 07fac816318676d524148085e72ab4421675cfde
Author: Mark Thomas 
AuthorDate: Fri Apr 3 21:07:34 2020 +0100

Deprecate Loader#reloadable
---
 java/org/apache/catalina/Loader.java | 8 
 webapps/docs/config/loader.xml   | 4 
 2 files changed, 12 insertions(+)

diff --git a/java/org/apache/catalina/Loader.java 
b/java/org/apache/catalina/Loader.java
index dfe2461..b14deb5 100644
--- a/java/org/apache/catalina/Loader.java
+++ b/java/org/apache/catalina/Loader.java
@@ -96,7 +96,11 @@ public interface Loader {
 
 /**
  * @return the reloadable flag for this Loader.
+ *
+ * @deprecated Use {@link Context#getReloadable()}. This method will be
+ * removed in Tomcat 10.
  */
+@Deprecated
 public boolean getReloadable();
 
 
@@ -104,7 +108,11 @@ public interface Loader {
  * Set the reloadable flag for this Loader.
  *
  * @param reloadable The new reloadable flag
+ *
+ * @deprecated Use {@link Context#setReloadable(boolean)}. This method will
+ * be removed in Tomcat 10.
  */
+@Deprecated
 public void setReloadable(boolean reloadable);
 
 
diff --git a/webapps/docs/config/loader.xml b/webapps/docs/config/loader.xml
index b8ad79b..02478dc 100644
--- a/webapps/docs/config/loader.xml
+++ b/webapps/docs/config/loader.xml
@@ -90,6 +90,10 @@
   
 
   
+NOTE - This attribute has been deprecated in Tomcat
+9 and will be removed in Tomcat 10. Use the equivalent attribute on the
+surrounding Context component.
+
 Set to true if you want Catalina to monitor classes in
 /WEB-INF/classes/ and /WEB-INF/lib for
 changes, and automatically reload the web application if a change


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

[tomcat] branch master updated: Refactor to remove unnecessary Constants class

[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 7a784b1  Refactor to remove unnecessary Constants class
7a784b1 is described below

commit 7a784b1fce0adba3118b99d8ccaab2e1b70eec43
Author: Mark Thomas 
AuthorDate: Fri Apr 3 20:39:19 2020 +0100

Refactor to remove unnecessary Constants class
---
 java/org/apache/catalina/loader/Constants.java | 26 --
 .../catalina/loader/WebappClassLoaderBase.java |  3 +--
 java/org/apache/catalina/loader/WebappLoader.java  |  3 +--
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/java/org/apache/catalina/loader/Constants.java 
b/java/org/apache/catalina/loader/Constants.java
deleted file mode 100644
index 8407282..000
--- a/java/org/apache/catalina/loader/Constants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.catalina.loader;
-
-
-public class Constants {
-
-public static final String Package = "org.apache.catalina.loader";
-
-}
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 158d5c5..f30c793 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -194,8 +194,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 /**
  * The string manager for this package.
  */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
+protected static final StringManager sm = 
StringManager.getManager(WebappClassLoaderBase.class);
 
 
 // --- Constructors
diff --git a/java/org/apache/catalina/loader/WebappLoader.java 
b/java/org/apache/catalina/loader/WebappLoader.java
index 604d133..2727a31 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -105,8 +105,7 @@ public class WebappLoader extends LifecycleMBeanBase
 /**
  * The string manager for this package.
  */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
+protected static final StringManager sm = 
StringManager.getManager(WebappLoader.class);
 
 
 /**


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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 6b3f928d5553b49041b32267748362534b4f3a6e
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[tomcat] branch master updated: Remove completed item

[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 6b3f928  Remove completed item
6b3f928 is described below

commit 6b3f928d5553b49041b32267748362534b4f3a6e
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:26:24 2020 +0100

Remove completed item
---
 TOMCAT-NEXT.txt | 4 
 1 file changed, 4 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index 1587fe1..129a8c7 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -29,10 +29,6 @@ New items for 10.0.x onwards:
 
  1. Remove APR connector.
 
- 2. Clean-up content-type header processing. Remove the optional space after
-the ';' character (if any). Don't mutate the header if there is no charset
-parameter. See BZ 62912 for some discussion and additional references.
-
 Deferred until 10.1.x:
 
  1. Remove the ExtensionValidator and associated classes (assuming that the


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

[tomcat] branch master updated (b30bd06 -> a2a124e)

[markt]

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

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


from b30bd06  Fix typo. Better test coverage.
 new 53f678e  Don't mutate a valid Content-type if it does not contain a 
charset
 new d74a05d  Remove work-around for buggy Adobe Reader plug-in 9 on IE
 new a2a124e  Update changelog

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:
 java/org/apache/catalina/connector/Response.java   | 12 ++--
 java/org/apache/coyote/Response.java   |  9 -
 java/org/apache/tomcat/util/http/parser/MediaType.java |  4 
 test/org/apache/coyote/TestResponse.java   |  2 --
 webapps/docs/changelog.xml |  5 +
 5 files changed, 23 insertions(+), 9 deletions(-)


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

[tomcat] 01/03: Don't mutate a valid Content-type if it does not contain a charset

[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

commit 53f678ed9a0f9ff81abb6650fb0e553278a2a319
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:20:34 2020 +0100

Don't mutate a valid Content-type if it does not contain a charset
---
 java/org/apache/catalina/connector/Response.java | 12 ++--
 java/org/apache/coyote/Response.java |  9 -
 test/org/apache/coyote/TestResponse.java |  2 --
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 9e4b77e..af9c811 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -734,9 +734,17 @@ public class Response implements HttpServletResponse {
 return;
 }
 
-getCoyoteResponse().setContentTypeNoCharset(m[0]);
 
-if (m[1] != null) {
+if (m[1] == null) {
+// No charset and we know value is valid as cache lookup was
+// successful
+// Pass-through user provided value in case user-agent is buggy and
+// requires specific format
+getCoyoteResponse().setContentTypeNoCharset(type);
+} else {
+// There is a charset so have to rebuild content-type without it
+getCoyoteResponse().setContentTypeNoCharset(m[0]);
+
 // Ignore charset if getWriter() has already been called
 if (!usingWriter) {
 try {
diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 38cc609..91473a1 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -554,7 +554,14 @@ public final class Response {
 
 String charsetValue = m.getCharset();
 
-if (charsetValue != null) {
+if (charsetValue == null) {
+// No charset and we know value is valid as parser was successful
+// Pass-through user provided value in case user-agent is buggy and
+// requires specific format
+this.contentType = type;
+} else {
+// There is a charset so have to rebuild content-type without it
+this.contentType = m.toStringNoCharset();
 charsetValue = charsetValue.trim();
 if (charsetValue.length() > 0) {
 try {
diff --git a/test/org/apache/coyote/TestResponse.java 
b/test/org/apache/coyote/TestResponse.java
index 1ed01a7..f87e524 100644
--- a/test/org/apache/coyote/TestResponse.java
+++ b/test/org/apache/coyote/TestResponse.java
@@ -27,7 +27,6 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -86,7 +85,6 @@ public class TestResponse extends TomcatBaseTest {
 }
 
 
-@Ignore // Disabled until Bug 62912 is addressed
 @Test
 public void testContentTypeWithoutSpace() throws Exception {
 doTestContentTypeSpacing(false);


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

[tomcat] 03/03: Update changelog

[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

commit a2a124ed1b161d9ad0da67ea9219473a2f06
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:23:52 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dc8af5f..cb70a71 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,11 @@
 AprLifecycleListener so that the only way to use the APR
 connectors is to set the full class name. (remm)
   
+  
+62912: Don't mutate an application provided content header 
if
+it does not contain a charset. Also remove the outdated workaround for
+the buggy Adobe Reader 9 plug-in for IE. (markt)
+  
 
   
 


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

[tomcat] 02/03: Remove work-around for buggy Adobe Reader plug-in 9 on IE

[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

commit d74a05d5100128f1b1715f700d715962b5a01b78
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:21:40 2020 +0100

Remove work-around for buggy Adobe Reader plug-in 9 on IE
---
 java/org/apache/tomcat/util/http/parser/MediaType.java | 4 
 1 file changed, 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java 
b/java/org/apache/tomcat/util/http/parser/MediaType.java
index b4b84ae..2c548c0 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -78,10 +78,6 @@ public class MediaType {
 continue;
 }
 result.append(';');
-// Workaround for Adobe Read 9 plug-in on IE bug
-// Can be removed after 26 June 2013 (EOL of Reader 9)
-// See BZ 53814
-result.append(' ');
 result.append(entry.getKey());
 result.append('=');
 result.append(value);


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

[Bug 62912] Tomcat adds a space character in the Content-Type header if this one has a ; character right after

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #15 from Mark Thomas  ---
Applied to master for 10.0.0-M5

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 63948] MultipartFile upload big files over HTTP/2 broken

[bugzilla]

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

--- Comment #7 from matt...@cacorp.com ---
Disabling overhead protection works, thank you! But, are there downsides to
doing so? You recommend using a newer client, but the clients I'm using that
run into this problem are the current versions of Firefox and Chrome.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Fix typo. Better test coverage.

[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 2def975  Fix typo. Better test coverage.
2def975 is described below

commit 2def975f83ac639846c438857e2cd43dfc66c737
Author: Mark Thomas 
AuthorDate: Fri Apr 3 18:54:03 2020 +0100

Fix typo. Better test coverage.
---
 test/org/apache/tomcat/util/res/TestStringManager.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/res/TestStringManager.java 
b/test/org/apache/tomcat/util/res/TestStringManager.java
index 7caeead..97959ab 100644
--- a/test/org/apache/tomcat/util/res/TestStringManager.java
+++ b/test/org/apache/tomcat/util/res/TestStringManager.java
@@ -53,9 +53,17 @@ public class TestStringManager {
 }
 
 @Test
-public void testMissing() {
+public void testMissingWithTccl() {
 
Thread.currentThread().setContextClassLoader(TestStringManager.class.getClassLoader());
-StringManager sm = StringManager.getManager("org.does.no.exist");
+StringManager sm = StringManager.getManager("org.does.not.exist");
+Assert.assertNull(sm.getLocale());
+}
+
+
+@Test
+public void testMissingNullTccl() {
+Thread.currentThread().setContextClassLoader(null);
+StringManager sm = StringManager.getManager("org.does.not.exist");
 Assert.assertNull(sm.getLocale());
 }
 


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

[tomcat] branch 8.5.x updated: Fix typo. Better test coverage.

[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 04a5714  Fix typo. Better test coverage.
04a5714 is described below

commit 04a571475d74c547bf6268fd1a1211822bfb6880
Author: Mark Thomas 
AuthorDate: Fri Apr 3 18:54:03 2020 +0100

Fix typo. Better test coverage.
---
 test/org/apache/tomcat/util/res/TestStringManager.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/res/TestStringManager.java 
b/test/org/apache/tomcat/util/res/TestStringManager.java
index 7caeead..97959ab 100644
--- a/test/org/apache/tomcat/util/res/TestStringManager.java
+++ b/test/org/apache/tomcat/util/res/TestStringManager.java
@@ -53,9 +53,17 @@ public class TestStringManager {
 }
 
 @Test
-public void testMissing() {
+public void testMissingWithTccl() {
 
Thread.currentThread().setContextClassLoader(TestStringManager.class.getClassLoader());
-StringManager sm = StringManager.getManager("org.does.no.exist");
+StringManager sm = StringManager.getManager("org.does.not.exist");
+Assert.assertNull(sm.getLocale());
+}
+
+
+@Test
+public void testMissingNullTccl() {
+Thread.currentThread().setContextClassLoader(null);
+StringManager sm = StringManager.getManager("org.does.not.exist");
 Assert.assertNull(sm.getLocale());
 }
 


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

[tomcat] branch 9.0.x updated: Fix typo. Better test coverage.

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new debf532  Fix typo. Better test coverage.
debf532 is described below

commit debf5329db23e5d7cf119e0e3e99708347afc9a0
Author: Mark Thomas 
AuthorDate: Fri Apr 3 18:54:03 2020 +0100

Fix typo. Better test coverage.
---
 test/org/apache/tomcat/util/res/TestStringManager.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/res/TestStringManager.java 
b/test/org/apache/tomcat/util/res/TestStringManager.java
index 7caeead..97959ab 100644
--- a/test/org/apache/tomcat/util/res/TestStringManager.java
+++ b/test/org/apache/tomcat/util/res/TestStringManager.java
@@ -53,9 +53,17 @@ public class TestStringManager {
 }
 
 @Test
-public void testMissing() {
+public void testMissingWithTccl() {
 
Thread.currentThread().setContextClassLoader(TestStringManager.class.getClassLoader());
-StringManager sm = StringManager.getManager("org.does.no.exist");
+StringManager sm = StringManager.getManager("org.does.not.exist");
+Assert.assertNull(sm.getLocale());
+}
+
+
+@Test
+public void testMissingNullTccl() {
+Thread.currentThread().setContextClassLoader(null);
+StringManager sm = StringManager.getManager("org.does.not.exist");
 Assert.assertNull(sm.getLocale());
 }
 


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

[tomcat] branch master updated: Fix typo. Better test coverage.

[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 b30bd06  Fix typo. Better test coverage.
b30bd06 is described below

commit b30bd0624b25ee1de2eb3b2817eb352232b97c38
Author: Mark Thomas 
AuthorDate: Fri Apr 3 18:54:03 2020 +0100

Fix typo. Better test coverage.
---
 test/org/apache/tomcat/util/res/TestStringManager.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/res/TestStringManager.java 
b/test/org/apache/tomcat/util/res/TestStringManager.java
index 7caeead..97959ab 100644
--- a/test/org/apache/tomcat/util/res/TestStringManager.java
+++ b/test/org/apache/tomcat/util/res/TestStringManager.java
@@ -53,9 +53,17 @@ public class TestStringManager {
 }
 
 @Test
-public void testMissing() {
+public void testMissingWithTccl() {
 
Thread.currentThread().setContextClassLoader(TestStringManager.class.getClassLoader());
-StringManager sm = StringManager.getManager("org.does.no.exist");
+StringManager sm = StringManager.getManager("org.does.not.exist");
+Assert.assertNull(sm.getLocale());
+}
+
+
+@Test
+public void testMissingNullTccl() {
+Thread.currentThread().setContextClassLoader(null);
+StringManager sm = StringManager.getManager("org.does.not.exist");
 Assert.assertNull(sm.getLocale());
 }
 


-
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 (b7a92ad -> 0be3e38)

[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 b7a92ad  Increment version number for next development cycle
 new f57e3f7  Refactoring: Extract inner class
 new aa7271f  Refactor: Replace MappingMatch enum with 
ApplicationMappingMatch
 new 1a87ea8  Refactor: Remove HttpServletMapping interface
 new 0be3e38  Refactoring: Remove remainder of servlet4preview package

The 4 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:
 java/javax/el/ImportHandler.java   |   2 +-
 java/org/apache/catalina/connector/Request.java|   7 +-
 .../apache/catalina/connector/RequestFacade.java   |  13 +-
 .../apache/catalina/core/ApplicationContext.java   |   3 +-
 .../catalina/core/ApplicationDispatcher.java   |  23 +--
 .../catalina/core/ApplicationHttpRequest.java  |  18 +-
 .../apache/catalina/core/ApplicationMapping.java   |  67 +++
 .../core/ApplicationMappingImpl.java}  |  44 +++--
 .../ApplicationMappingMatch.java}  |   6 +-
 .../org/apache/catalina/filters/ExpiresFilter.java |  30 ++--
 java/org/apache/catalina/mapper/Mapper.java|  12 +-
 java/org/apache/catalina/mapper/MappingData.java   |   4 +-
 .../servlet4preview/http/HttpServletMapping.java   |  53 --
 .../servlet4preview/http/HttpServletRequest.java   |  25 ---
 .../http/HttpServletRequestWrapper.java|  53 --
 ...estApplicationContextGetRequestDispatcherB.java | 198 ++---
 .../catalina/core/TestApplicationMapping.java  |  10 +-
 webapps/docs/changelog.xml |  10 ++
 18 files changed, 201 insertions(+), 377 deletions(-)
 copy java/org/apache/{tomcat/util/descriptor/web/InjectionTarget.java => 
catalina/core/ApplicationMappingImpl.java} (51%)
 rename java/org/apache/catalina/{servlet4preview/http/MappingMatch.java => 
core/ApplicationMappingMatch.java} (90%)
 delete mode 100644 
java/org/apache/catalina/servlet4preview/http/HttpServletMapping.java
 delete mode 100644 
java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
 delete mode 100644 
java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java


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

[tomcat] 03/04: Refactor: Remove HttpServletMapping interface

[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 1a87ea891530d2839586b3221d100bf741af1e20
Author: Mark Thomas 
AuthorDate: Fri Apr 3 16:59:55 2020 +0100

Refactor: Remove HttpServletMapping interface
---
 java/org/apache/catalina/connector/Request.java|  4 +-
 .../apache/catalina/connector/RequestFacade.java   |  4 +-
 .../apache/catalina/core/ApplicationContext.java   |  3 +-
 .../catalina/core/ApplicationDispatcher.java   |  9 ++--
 .../catalina/core/ApplicationHttpRequest.java  |  7 ++-
 .../apache/catalina/core/ApplicationMapping.java   |  5 +-
 .../catalina/core/ApplicationMappingImpl.java  | 12 ++---
 .../servlet4preview/http/HttpServletMapping.java   | 55 --
 .../servlet4preview/http/HttpServletRequest.java   |  4 +-
 .../http/HttpServletRequestWrapper.java|  3 +-
 ...estApplicationContextGetRequestDispatcherB.java |  8 ++--
 .../catalina/core/TestApplicationMapping.java  |  9 ++--
 12 files changed, 31 insertions(+), 92 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index dbc2c16..71a107d 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -77,12 +77,12 @@ import org.apache.catalina.TomcatPrincipal;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.ApplicationFilterChain;
 import org.apache.catalina.core.ApplicationMapping;
+import org.apache.catalina.core.ApplicationMappingImpl;
 import org.apache.catalina.core.ApplicationPart;
 import org.apache.catalina.core.ApplicationPushBuilder;
 import org.apache.catalina.core.ApplicationSessionCookieConfig;
 import org.apache.catalina.core.AsyncContextImpl;
 import org.apache.catalina.mapper.MappingData;
-import org.apache.catalina.servlet4preview.http.HttpServletMapping;
 import org.apache.catalina.session.ManagerBase;
 import org.apache.catalina.util.ParameterMap;
 import org.apache.catalina.util.TLSUtil;
@@ -2304,7 +2304,7 @@ public class Request implements 
org.apache.catalina.servlet4preview.http.HttpSer
 
 
 @Override
-public HttpServletMapping getHttpServletMapping() {
+public ApplicationMappingImpl getHttpServletMapping() {
 return applicationMapping.getHttpServletMapping();
 }
 
diff --git a/java/org/apache/catalina/connector/RequestFacade.java 
b/java/org/apache/catalina/connector/RequestFacade.java
index 41d0dde..3ecf5b9 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -40,9 +40,9 @@ import javax.servlet.http.HttpUpgradeHandler;
 import javax.servlet.http.Part;
 
 import org.apache.catalina.Globals;
+import org.apache.catalina.core.ApplicationMappingImpl;
 import org.apache.catalina.core.ApplicationPushBuilder;
 import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.servlet4preview.http.HttpServletMapping;
 import org.apache.catalina.servlet4preview.http.HttpServletRequest;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -1123,7 +1123,7 @@ public class RequestFacade implements HttpServletRequest {
  * removed or replaced at any time until Servlet 4.0 becomes final.
  */
 @Override
-public HttpServletMapping getHttpServletMapping() {
+public ApplicationMappingImpl getHttpServletMapping() {
 return request.getHttpServletMapping();
 }
 
diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index d44ef02..8a42c24 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -67,7 +67,6 @@ import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.mapper.MappingData;
-import org.apache.catalina.servlet4preview.http.HttpServletMapping;
 import org.apache.catalina.util.Introspection;
 import org.apache.catalina.util.ServerInfo;
 import org.apache.catalina.util.URLEncoder;
@@ -482,7 +481,7 @@ public class ApplicationContext implements ServletContext {
 Wrapper wrapper = mappingData.wrapper;
 String wrapperPath = mappingData.wrapperPath.toString();
 String pathInfo = mappingData.pathInfo.toString();
-HttpServletMapping mapping = new 
ApplicationMapping(mappingData).getHttpServletMapping();
+ApplicationMappingImpl mapping = new 
ApplicationMapping(mappingData).getHttpServletMapping();
 
 // Construct a RequestDispatcher to process this request
 return new ApplicationDispatcher(wrapper, uri, wrapperPath, 
pathInfo,
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 

[tomcat] 04/04: Refactoring: Remove remainder of servlet4preview package

[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 0be3e38a07ceb1c75e568915bef496f63edbc9b6
Author: Mark Thomas 
AuthorDate: Fri Apr 3 17:23:53 2020 +0100

Refactoring: Remove remainder of servlet4preview package

The functionality remains but requires casting to the appropriate
internal Tomcat class.
---
 java/org/apache/catalina/connector/Request.java|  3 +-
 .../apache/catalina/connector/RequestFacade.java   |  9 +---
 .../catalina/core/ApplicationDispatcher.java   | 18 +---
 .../catalina/core/ApplicationHttpRequest.java  | 11 ++---
 .../apache/catalina/core/ApplicationMapping.java   | 25 ++
 .../catalina/core/ApplicationMappingImpl.java  | 16 +++
 .../org/apache/catalina/filters/ExpiresFilter.java | 28 ++-
 .../servlet4preview/http/HttpServletRequest.java   | 27 ---
 .../http/HttpServletRequestWrapper.java| 54 --
 ...estApplicationContextGetRequestDispatcherB.java |  3 +-
 .../catalina/core/TestApplicationMapping.java  |  3 +-
 webapps/docs/changelog.xml | 10 
 12 files changed, 73 insertions(+), 134 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 71a107d..301d5a9 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -125,7 +125,7 @@ import org.ietf.jgss.GSSException;
  * @author Remy Maucherat
  * @author Craig R. McClanahan
  */
-public class Request implements 
org.apache.catalina.servlet4preview.http.HttpServletRequest {
+public class Request implements HttpServletRequest {
 
 private static final Log log = LogFactory.getLog(Request.class);
 
@@ -2303,7 +2303,6 @@ public class Request implements 
org.apache.catalina.servlet4preview.http.HttpSer
 }
 
 
-@Override
 public ApplicationMappingImpl getHttpServletMapping() {
 return applicationMapping.getHttpServletMapping();
 }
diff --git a/java/org/apache/catalina/connector/RequestFacade.java 
b/java/org/apache/catalina/connector/RequestFacade.java
index 3ecf5b9..e80147c 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -34,6 +34,7 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpUpgradeHandler;
@@ -43,7 +44,6 @@ import org.apache.catalina.Globals;
 import org.apache.catalina.core.ApplicationMappingImpl;
 import org.apache.catalina.core.ApplicationPushBuilder;
 import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.servlet4preview.http.HttpServletRequest;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -1116,13 +1116,6 @@ public class RequestFacade implements HttpServletRequest 
{
 }
 
 
-/**
- * {@inheritDoc}
- * 
- * Pulled forward from Servlet 4.0. The method signature may be modified,
- * removed or replaced at any time until Servlet 4.0 becomes final.
- */
-@Override
 public ApplicationMappingImpl getHttpServletMapping() {
 return request.getHttpServletMapping();
 }
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index eb3d420..c32a78e 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -371,14 +371,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
   hrequest.getPathInfo());
 wrequest.setAttribute(RequestDispatcher.FORWARD_QUERY_STRING,
   hrequest.getQueryString());
-ApplicationMappingImpl mapping;
-if (hrequest instanceof 
org.apache.catalina.servlet4preview.http.HttpServletRequest) {
-mapping = 
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
-hrequest).getHttpServletMapping();
-} else {
-mapping = (new 
ApplicationMapping(null)).getHttpServletMapping();
-}
-wrequest.setAttribute(FORWARD_MAPPING, mapping);
+wrequest.setAttribute(FORWARD_MAPPING, 
ApplicationMapping.getHttpServletMapping(hrequest));
 }
 
 wrequest.setContextPath(context.getEncodedPath());
@@ -626,14 +619,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
 
 

[tomcat] 02/04: Refactor: Replace MappingMatch enum with ApplicationMappingMatch

[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 aa7271f41b730edbfe4a069f97b29840f31a2029
Author: Mark Thomas 
AuthorDate: Fri Apr 3 16:53:53 2020 +0100

Refactor: Replace MappingMatch enum with ApplicationMappingMatch
---
 java/javax/el/ImportHandler.java   |   2 +-
 .../catalina/core/ApplicationMappingImpl.java  |   7 +-
 .../ApplicationMappingMatch.java}  |   6 +-
 .../org/apache/catalina/filters/ExpiresFilter.java |   4 +-
 java/org/apache/catalina/mapper/Mapper.java|  12 +-
 java/org/apache/catalina/mapper/MappingData.java   |   4 +-
 .../servlet4preview/http/HttpServletMapping.java   |   4 +-
 ...estApplicationContextGetRequestDispatcherB.java | 189 ++---
 8 files changed, 113 insertions(+), 115 deletions(-)

diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index b31a75f..151b3ab 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -114,7 +114,7 @@ public class ImportHandler {
 servletHttpClassNames.add("HttpSessionEvent");
 servletHttpClassNames.add("HttpUtils");
 // Enums
-servletHttpClassNames.add("MappingMatch");
+servletHttpClassNames.add("ApplicationMappingMatch");
 standardPackages.put("javax.servlet.http", servletHttpClassNames);
 
 // JSP 2.3
diff --git a/java/org/apache/catalina/core/ApplicationMappingImpl.java 
b/java/org/apache/catalina/core/ApplicationMappingImpl.java
index e8d21c6..cf64d24 100644
--- a/java/org/apache/catalina/core/ApplicationMappingImpl.java
+++ b/java/org/apache/catalina/core/ApplicationMappingImpl.java
@@ -1,16 +1,15 @@
 package org.apache.catalina.core;
 
 import org.apache.catalina.servlet4preview.http.HttpServletMapping;
-import org.apache.catalina.servlet4preview.http.MappingMatch;
 
 public class ApplicationMappingImpl implements HttpServletMapping {
 
 private final String matchValue;
 private final String pattern;
-private final MappingMatch mappingType;
+private final ApplicationMappingMatch mappingType;
 private final String servletName;
 
-public ApplicationMappingImpl(String matchValue, String pattern, 
MappingMatch mappingType, String servletName) {
+public ApplicationMappingImpl(String matchValue, String pattern, 
ApplicationMappingMatch mappingType, String servletName) {
 this.matchValue = matchValue;
 this.pattern = pattern;
 this.mappingType = mappingType;
@@ -28,7 +27,7 @@ public class ApplicationMappingImpl implements 
HttpServletMapping {
 }
 
 @Override
-public MappingMatch getMappingMatch() {
+public ApplicationMappingMatch getMappingMatch() {
 return mappingType;
 }
 
diff --git a/java/org/apache/catalina/servlet4preview/http/MappingMatch.java 
b/java/org/apache/catalina/core/ApplicationMappingMatch.java
similarity index 90%
rename from java/org/apache/catalina/servlet4preview/http/MappingMatch.java
rename to java/org/apache/catalina/core/ApplicationMappingMatch.java
index 3dd54b0..cb1a9d8 100644
--- a/java/org/apache/catalina/servlet4preview/http/MappingMatch.java
+++ b/java/org/apache/catalina/core/ApplicationMappingMatch.java
@@ -14,14 +14,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.catalina.servlet4preview.http;
+package org.apache.catalina.core;
 
 /**
  * Represents the ways that a request can be mapped to a servlet
- *
- * @since 4.0
  */
-public enum MappingMatch {
+public enum ApplicationMappingMatch {
 
 CONTEXT_ROOT,
 DEFAULT,
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java 
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 8f1dab4..6c7ff78 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -42,7 +42,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-import org.apache.catalina.servlet4preview.http.MappingMatch;
+import org.apache.catalina.core.ApplicationMappingMatch;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
@@ -1296,7 +1296,7 @@ public class ExpiresFilter extends FilterBase {
 org.apache.catalina.servlet4preview.http.HttpServletRequest 
servlet4Request =
 
(org.apache.catalina.servlet4preview.http.HttpServletRequest) innerRequest;
 
-if (servlet4Request.getHttpServletMapping().getMappingMatch() 
== MappingMatch.DEFAULT &&
+if (servlet4Request.getHttpServletMapping().getMappingMatch() 
== ApplicationMappingMatch.DEFAULT &&
 response.getStatus() == 
HttpServletResponse.SC_NOT_MODIFIED) {
 // 

[tomcat] 01/04: Refactoring: Extract inner class

[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 f57e3f7615dc5b3dafd3cddc70b373b321c86368
Author: Mark Thomas 
AuthorDate: Fri Apr 3 16:50:58 2020 +0100

Refactoring: Extract inner class
---
 .../apache/catalina/core/ApplicationMapping.java   | 51 +++---
 .../catalina/core/ApplicationMappingImpl.java  | 39 +
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationMapping.java 
b/java/org/apache/catalina/core/ApplicationMapping.java
index 4d28f7a..9e528b3 100644
--- a/java/org/apache/catalina/core/ApplicationMapping.java
+++ b/java/org/apache/catalina/core/ApplicationMapping.java
@@ -18,7 +18,6 @@ package org.apache.catalina.core;
 
 import org.apache.catalina.mapper.MappingData;
 import org.apache.catalina.servlet4preview.http.HttpServletMapping;
-import org.apache.catalina.servlet4preview.http.MappingMatch;
 
 public class ApplicationMapping {
 
@@ -36,7 +35,7 @@ public class ApplicationMapping {
 // This can happen when dispatching from an application 
provided
 // request object that does not provide the Servlet 4.0 mapping
 // data.
-mapping = new MappingImpl("", "", null, "");
+mapping = new ApplicationMappingImpl("", "", null, "");
 } else {
 String servletName;
 if (mappingData.wrapper == null) {
@@ -45,23 +44,23 @@ public class ApplicationMapping {
 servletName = mappingData.wrapper.getName();
 }
 if (mappingData.matchType == null) {
-mapping = new MappingImpl("", "", null, servletName);
+mapping = new ApplicationMappingImpl("", "", null, 
servletName);
 } else {
 switch (mappingData.matchType) {
 case CONTEXT_ROOT:
-mapping = new MappingImpl("", "", 
mappingData.matchType, servletName);
+mapping = new ApplicationMappingImpl("", "", 
mappingData.matchType, servletName);
 break;
 case DEFAULT:
-mapping = new MappingImpl("", "/", 
mappingData.matchType, servletName);
+mapping = new ApplicationMappingImpl("", "/", 
mappingData.matchType, servletName);
 break;
 case EXACT:
-mapping = new 
MappingImpl(mappingData.wrapperPath.toString().substring(1),
+mapping = new 
ApplicationMappingImpl(mappingData.wrapperPath.toString().substring(1),
 mappingData.wrapperPath.toString(), 
mappingData.matchType, servletName);
 break;
 case EXTENSION:
 String path = mappingData.wrapperPath.toString();
 int extIndex = path.lastIndexOf('.');
-mapping = new MappingImpl(path.substring(1, 
extIndex),
+mapping = new 
ApplicationMappingImpl(path.substring(1, extIndex),
 "*" + path.substring(extIndex), 
mappingData.matchType, servletName);
 break;
 case PATH:
@@ -71,7 +70,7 @@ public class ApplicationMapping {
 } else {
 matchValue = 
mappingData.pathInfo.toString().substring(1);
 }
-mapping = new MappingImpl(matchValue, 
mappingData.wrapperPath.toString() + "/*",
+mapping = new ApplicationMappingImpl(matchValue, 
mappingData.wrapperPath.toString() + "/*",
 mappingData.matchType, servletName);
 break;
 }
@@ -85,40 +84,4 @@ public class ApplicationMapping {
 public void recycle() {
 mapping = null;
 }
-
-private static class MappingImpl implements HttpServletMapping {
-
-private final String matchValue;
-private final String pattern;
-private final MappingMatch mappingType;
-private final String servletName;
-
-public MappingImpl(String matchValue, String pattern, MappingMatch 
mappingType,
-String servletName) {
-this.matchValue = matchValue;
-this.pattern = pattern;
-this.mappingType = mappingType;
-this.servletName = servletName;
-}
-
-@Override
-public String getMatchValue() {
-return matchValue;
-}
-
-@Override
-public String getPattern() {
-return pattern;
-}
-
-

[tomcat] branch master updated: Remove useAprConnector flag and auto switch to APR connector

[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 ede5a2f  Remove useAprConnector flag and auto switch to APR connector
ede5a2f is described below

commit ede5a2fbe93b1e802cfefba9ff552e1a7fa33bd1
Author: remm 
AuthorDate: Fri Apr 3 18:48:27 2020 +0200

Remove useAprConnector flag and auto switch to APR connector

As a first step towards possibly removing the APR connector, simplify
Connector by dropping auto use of the APR connector. The default is now
always the NIO connector. Using the APR connector is still possible by
using the full protocol name (as documented).
Auto use of OpenSSL for TLS support if the AprLifecycleListener is
available and the Tomcat native library is available is not changed.
Rephrase some strings (IMO no big need to change the existing
translations).
---
 java/org/apache/catalina/connector/Connector.java  | 25 --
 .../apache/catalina/core/AprLifecycleListener.java | 15 -
 .../apache/catalina/core/LocalStrings.properties   | 15 ++---
 webapps/docs/apr.xml   | 16 --
 webapps/docs/changelog.xml |  9 
 webapps/docs/config/ajp.xml| 10 ++---
 webapps/docs/config/http.xml   | 19 +---
 webapps/docs/config/listeners.xml  |  8 ---
 8 files changed, 36 insertions(+), 81 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index c1b1f5f..20118f7 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -73,21 +73,10 @@ public class Connector extends LifecycleMBeanBase  {
 
 
 public Connector(String protocol) {
-boolean aprConnector = AprLifecycleListener.isAprAvailable() &&
-AprLifecycleListener.getUseAprConnector();
-
 if ("HTTP/1.1".equals(protocol) || protocol == null) {
-if (aprConnector) {
-protocolHandlerClassName = 
"org.apache.coyote.http11.Http11AprProtocol";
-} else {
-protocolHandlerClassName = 
"org.apache.coyote.http11.Http11NioProtocol";
-}
+protocolHandlerClassName = 
"org.apache.coyote.http11.Http11NioProtocol";
 } else if ("AJP/1.3".equals(protocol)) {
-if (aprConnector) {
-protocolHandlerClassName = 
"org.apache.coyote.ajp.AjpAprProtocol";
-} else {
-protocolHandlerClassName = 
"org.apache.coyote.ajp.AjpNioProtocol";
-}
+protocolHandlerClassName = "org.apache.coyote.ajp.AjpNioProtocol";
 } else {
 protocolHandlerClassName = protocol;
 }
@@ -661,15 +650,9 @@ public class Connector extends LifecycleMBeanBase  {
  * @return the Coyote protocol handler in use.
  */
 public String getProtocol() {
-if 
(("org.apache.coyote.http11.Http11NioProtocol".equals(getProtocolHandlerClassName())
 &&
-(!AprLifecycleListener.isAprAvailable() || 
!AprLifecycleListener.getUseAprConnector())) ||
-
"org.apache.coyote.http11.Http11AprProtocol".equals(getProtocolHandlerClassName())
 &&
-AprLifecycleListener.getUseAprConnector()) {
+if 
("org.apache.coyote.http11.Http11NioProtocol".equals(getProtocolHandlerClassName()))
 {
 return "HTTP/1.1";
-} else if 
(("org.apache.coyote.ajp.AjpNioProtocol".equals(getProtocolHandlerClassName()) 
&&
-(!AprLifecycleListener.isAprAvailable() || 
!AprLifecycleListener.getUseAprConnector())) ||
-
"org.apache.coyote.ajp.AjpAprProtocol".equals(getProtocolHandlerClassName()) &&
-AprLifecycleListener.getUseAprConnector()) {
+} else if 
("org.apache.coyote.ajp.AjpNioProtocol".equals(getProtocolHandlerClassName())) {
 return "AJP/1.3";
 }
 return getProtocolHandlerClassName();
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 0bde68c..8e1d85c 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -78,7 +78,6 @@ public class AprLifecycleListener
 protected static boolean sslInitialized = false;
 protected static boolean aprInitialized = false;
 protected static boolean aprAvailable = false;
-protected static boolean useAprConnector = false;
 protected static boolean useOpenSSL = true;
 protected static boolean fipsModeActive = false;
 
@@ -254,10 +253,6 @@ public class AprLifecycleListener
 

[tomcat] branch master updated: Remove a completed item. Make formatting consistent.

[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 8bccf2f  Remove a completed item. Make formatting consistent.
8bccf2f is described below

commit 8bccf2f1df43b845caa4e442463e882a051a4bd6
Author: Mark Thomas 
AuthorDate: Fri Apr 3 15:41:10 2020 +0100

Remove a completed item. Make formatting consistent.
---
 TOMCAT-NEXT.txt | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index f8cd94c..1587fe1 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -19,10 +19,10 @@ Notes of things to consider for the next major Tomcat 
release (10.0.x)
 
 Items carried over from the 9.0.x list:
 
-1.  Remove the use of system properties to control configuration wherever
+ 1. Remove the use of system properties to control configuration wherever
 possible.
 
-2.  Reduce instances of setters and getters for the same property existing on 
an
+ 2. Reduce instances of setters and getters for the same property existing on 
an
 object and its parent. This may require new objects to be exposed via JMX.
 
 New items for 10.0.x onwards:
@@ -33,16 +33,12 @@ New items for 10.0.x onwards:
 the ';' character (if any). Don't mutate the header if there is no charset
 parameter. See BZ 62912 for some discussion and additional references.
 
- 3. RFC 3986 states (section 2.2) that a %nn encoded delimiter is NOT 
equivalent
-to the decoded form. Provide an option not to decode delimiters in %nn 
form.
-
 Deferred until 10.1.x:
 
- 1.  Remove the ExtensionValidator and associated classes (assuming that the
- minimum Java version is Java 9 or later).
+ 1. Remove the ExtensionValidator and associated classes (assuming that the
+minimum Java version is Java 9 or later).
 
  2. Remove org.apache.tomcat.jni and replace with the minimum necessary to
 interface with OpenSSL and clones.
 We might want to park this one until we see what is available direct from
 the JRE with project Panama.
-


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

[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 b7a92ad  Increment version number for next development cycle
b7a92ad is described below

commit b7a92ad96550bd12f10f453461ade0b82f32c520
Author: Mark Thomas 
AuthorDate: Fri Apr 3 15:36:08 2020 +0100

Increment version number 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 d7c1066..691f2dd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=54
+version.build=55
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index ac7fd7b..14bed64 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.54
+maven.asf.release.deploy.version=8.5.55
 
 #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 ccfb07a..c4b0f93 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 9.0.x updated: Increment version number for next development cycle

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 3ccd61a  Increment version number for next development cycle
3ccd61a is described below

commit 3ccd61a0559fb97fff8bd7180a94cd813a744e41
Author: Mark Thomas 
AuthorDate: Fri Apr 3 15:35:05 2020 +0100

Increment version number 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 7d2404e..e044bfd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=34
+version.build=35
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 4b6f594..38b9d08 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.34
+maven.asf.release.deploy.version=9.0.35
 
 #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 81a5d6b..11d9a12 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 master updated: Increment version for next development cycle

[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 12225da  Increment version for next development cycle
12225da is described below

commit 12225daa448daf602c8714675c1fb02cae6c5d72
Author: Mark Thomas 
AuthorDate: Fri Apr 3 15:33:45 2020 +0100

Increment version 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 33b1fbe..efc9673 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M4-dev
+version.suffix=-M5-dev
 
 # - Source control flags -
 git.branch=master
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 0d7e707..11d0087 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=10.0.0-M4
+maven.asf.release.deploy.version=10.0.0-M5
 
 #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 0241d8a..ea9b3ab 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

Re: [VOTE] Release Apache Tomcat 9.0.34

[Rémy Maucherat]

On Fri, Apr 3, 2020 at 2:49 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.34 release is now available for voting.
>
> The major changes compared to the 9.0.34 release are:
>
> - Add support for default values when using ${...} property replacement
>   in configuration files. Based on a pull request provided by Bernd
>   Bohmann.
>
> - When configuring an HTTP Connector, warn if the encoding specified for
>   URIEncoding is not a superset of US-ASCII as required by RFC7230.
>
> - Replace the system property
>   org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH with the
>   Connector attribute encodedSolidusHandling that adds an additional
>   option to pass the %2f sequence through to the application without
>   decoding it in addition to rejecting such sequences and decoding such
>   sequences.
>
> 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.34/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1263/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.34
> 1031a8edb864ac001a8f172161aa8a13b7a4e712
>
> The proposed 9.0.34 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.34
>
> No testing issue.

Rémy

[VOTE] Release Apache Tomcat 8.5.54

[Mark Thomas]

The proposed Apache Tomcat 8.5.54 release is now available for voting.

The major changes compared to the 8.5.53 release are:

- Add support for default values when using ${...} property replacement
  in configuration files. Based on a pull request provided by Bernd
  Bohmann.

- When configuring an HTTP Connector, warn if the encoding specified for
  URIEncoding is not a superset of US-ASCII as required by RFC7230.

- Replace the system property
  org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH with the
  Connector attribute encodedSolidusHandling that adds an additional
  option to pass the %2f sequence through to the application without
  decoding it in addition to rejecting such sequences and decoding such
  sequences.

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.54/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1264/

The tag is:
https://github.com/apache/tomcat/tree/8.5.54
0b365bb7032a5e30b35fedc56e7def82a3e55f94

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

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

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.pom(SHA1: 6c14fa977318213855dbd85942422b44f5e3e102)/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.jar(SHA1: 36d777f00e7450c15bda68095ad516e41a56eab8)/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.jar.asc(SHA1: 1f05781d9ed7055b26ad5b14436622ae40c81ee5)/org/apache/tomcat/tomcat-i18n-de/8.5.54/tomcat-i18n-de-8.5.54.pom.asc(SHA1: b7fc2fcbf483ca680010975f345405d7cb03e196)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.jar(SHA1: 4d9b9576671446b5fe34047bf3f867da6db045c3)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.pom(SHA1: c99e04bc3389729ed5f315b9c737c347c56687d2)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.jar.asc(SHA1: e860f9e28db0944a5cc90c9456f5936127bcea0c)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54-sources.jar.asc(SHA1: fd94628db5691eed06d5468c75cbe6f6c2c35321)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54.pom.asc(SHA1: 0fe417aff144f22dd9f15f194b60a9fa867d516d)/org/apache/tomcat/tomcat-jni/8.5.54/tomcat-jni-8.5.54-sources.jar(SHA1: 7ef0fea21b06216496dd09dd6e146d8de56c3a4d)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54-sources.jar(SHA1: 67c4e22dd4fc03c3f0b6ca203adfad3df009c313)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54-sources.jar.asc(SHA1: 62e761ef93dc4b6c922a42d21ac759a85a53fda5)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.pom(SHA1: efe712f8964ecc4caf253dcc2f8e259be0975353)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.jar(SHA1: 677fc8881c4aea41b38c1955e27acade5edf8aaf)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.pom.asc(SHA1: 8caf6387e3c9ce450a176029b16bb8731953ec2c)/org/apache/tomcat/tomcat-juli/8.5.54/tomcat-juli-8.5.54.jar.asc(SHA1: 391f62055b4eada7172e11e3d0173588bf1bb132)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54-sources.jar.asc(SHA1: 230e5212a0a55e3d5e25e42e918bcb13b0b15df6)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.pom.asc(SHA1: d74f98b222340a79479468ca27bc215516c7a815)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.pom(SHA1: b8cf76dd46e6c48b2c3cef205221108ccc8c6522)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54-sources.jar(SHA1: 2b8ce355bb7ec6895afbc3cd82e7810fa72915c1)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.jar.asc(SHA1: 26e805bbe31e73d67eecb50aee59d9321bb3173f)/org/apache/tomcat/tomcat-util/8.5.54/tomcat-util-8.5.54.jar(SHA1: 24d6667671bb7ed638a41c2e547a10927deeebce)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.pom.asc(SHA1: e9a465f1524b425c8d50fe08e9686c7b67a25877)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54-sources.jar.asc(SHA1: 6d809a203a37377a6f49139d1eceef9fce77bdb9)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.jar.asc(SHA1: f9aea5f2558b5cb8e26f77d944b832ead299f9ec)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.pom(SHA1: ab12103d35cadf506ca667dab3055db47bd17c1a)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54.jar(SHA1: 91f61e5735bc4f0c9a989696bfa2e02f7d250ff3)/org/apache/tomcat/tomcat-catalina/8.5.54/tomcat-catalina-8.5.54-sources.jar(SHA1: 9208f8dfea3509e4f1bc9f22cc0772ee0a4a601b)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.jar(SHA1: c4287a047d15248f3ff6497de332903d3aa63486)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54-sources.jar.asc(SHA1: 960eb139f63e115e617b4864154971b2fe553c83)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.jar.asc(SHA1: fa7ac37c8c6b594e90fc4b5358a0c7b96e6f9a8a)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.pom.asc(SHA1: a47af3faa5d081b317efe00abafbef984ef7731b)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54-sources.jar(SHA1: 1919adb6531fdac2b69cdf93b5be3165dfc06411)/org/apache/tomcat/tomcat-catalina-ws/8.5.54/tomcat-catalina-ws-8.5.54.pom(SHA1: c17a0251dc4b2e94b25f3f359df697e13dafa548)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.jar.asc(SHA1: 65c01eefe4042dab57705c50ed79423483cd0363)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.pom.asc(SHA1: 717053617df35b43a8dee2ce87493991490096f2)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.pom(SHA1: a59f05fda7fcc8efe1248363310e2f17310a1901)/org/apache/tomcat/tomcat-i18n-fr/8.5.54/tomcat-i18n-fr-8.5.54.jar(SHA1: b74fba22f6c298e2f0040039b90663f2b5978ec8)/org/apache/tomcat/tomcat-jdbc/8.5.54/tomcat-jdbc-8.5.54.pom(SHA1: 82b2a48ab363205bf36802abab8056b03af6e5d4)/org/apache/tomcat/tomcat-jdbc/8.5.54/tomcat-jdbc-8.5.54-sources.jar.asc(SHA1: 77068d7996b3c7843a2602a0cbb5bbb4868628b4)/org/apache/tomcat/tomcat-jdbc/8.5.54/tomcat-jdbc-8.5.54.jar.asc(SHA1: 

svn commit: r38800 [1/2] - in /dev/tomcat/tomcat-8/v8.5.54: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Fri Apr  3 14:23:01 2020
New Revision: 38800

Log:
Upload 8.5.54 for voting

Added:
dev/tomcat/tomcat-8/v8.5.54/
dev/tomcat/tomcat-8/v8.5.54/KEYS
dev/tomcat/tomcat-8/v8.5.54/README.html
dev/tomcat/tomcat-8/v8.5.54/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.54/bin/
dev/tomcat/tomcat-8/v8.5.54/bin/README.html
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.exe   (with props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.exe.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.exe.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.zip   (with props)
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.zip.asc
dev/tomcat/tomcat-8/v8.5.54/bin/apache-tomcat-8.5.54.zip.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/embed/
dev/tomcat/tomcat-8/v8.5.54/bin/embed/apache-tomcat-8.5.54-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.54/bin/embed/apache-tomcat-8.5.54-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.54/bin/embed/apache-tomcat-8.5.54-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/embed/apache-tomcat-8.5.54-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.54/bin/embed/apache-tomcat-8.5.54-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.54/bin/embed/apache-tomcat-8.5.54-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/extras/
dev/tomcat/tomcat-8/v8.5.54/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.54/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.54/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.54/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.54/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.54/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.54/src/
dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.asc
dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.54/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.54/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.54/KEYS Fri Apr  3 14:23:01 2020
@@ -0,0 +1,676 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz

svn commit: r38800 [2/2] - in /dev/tomcat/tomcat-8/v8.5.54: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Added: dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.asc Fri Apr  3 
14:23:01 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl6HROsACgkQEMAcWi9g
+WecrARAAuWgeHKaLue7ZdIK71Yx69WFrH7ssyHhba6aWZYlCClTzLeFiB/zC0NYs
+TspPV5F5PdYCHv87tv+uoVKYr62zUMWBLB8myORWHrS7ppdm2HTWVJu7ZOTGXn+L
+UBdTkLZ2B4qb7F/FKm48P37NtY6HC2zjbfCGjRjKWFHtUfL/IaF6zNqtbyaDREqz
+F0zXvS2M/h1a7vg0fX8nhTdx1OsADa0htkFMFIlelHZ/Q5w0hBCS8oLzLpGoTqdo
+EQcYSUqD+cXd/u7PGAve3fLX/nLdiCbCZ84InaMIdQZnFpKYtT1UT2c9nz5g/6OV
+YWVdeMq1d9m6sqd3FgQjhBaFddmcsJeNdpX/zlljppMf4pSVbujvvyZ3JzmEHwH2
+Y3LGhi9oUJqbsAkh5DtMRS9edkVFS7InwVeLUOn56o+4bai3QVlXhqlSFO2dVfbN
+sSuNW0T9qCjWOqMitT0Q1NQBRdryXl8Cyoj5vXnmiALiBvI2izZSQ2WW6qjVKKl3
+4RK++12a39Z7HkaQRiBmPge/1sMCTTrl8XkYCr8y08kx+e5k4aE17Rov0JdYFIYN
+hXKC+GsbI/vKX9O5r28YLTFq9odntJCISMy0FCqdffMN3P3hEQTTXGMrjfE5SOhG
+cP0OKA0s9IIbBMz7gGT//A6fXyETO3LX4U1HJsPsiELwn6i0q1U=
+=ZjJz
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.zip.sha512 Fri Apr 
 3 14:23:01 2020
@@ -0,0 +1 @@
+e6f8a379ecba20bfb31a0fe6d1a4ae9dcedbb640e79a37df13841acf319899c4aba3bf17ff45a76e0f99272b84c6af16ef1eee2d032af4a1a3d34b1a11cb0f52
 *apache-tomcat-8.5.54-src.zip
\ No newline at end of file



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

[tomcat] 01/01: Tag 8.5.54

[markt]

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

markt pushed a commit to tag 8.5.54
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0b365bb7032a5e30b35fedc56e7def82a3e55f94
Author: Mark Thomas 
AuthorDate: Fri Apr 3 15:00:18 2020 +0100

Tag 8.5.54
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d7c1066..7671968 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=54
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ccfb07a..248d71d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   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] tag 8.5.54 created (now 0b365bb)

[markt]

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

markt pushed a change to tag 8.5.54
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 0b365bb  (commit)
This tag includes the following new commits:

 new 0b365bb  Tag 8.5.54

The 1 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.



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

[Bug 64303] My Application is working fine in prev version of all tomcat, Planning to upgrade to 9.0.31 . I am running into the following issue.. Pls help org.apache.jasper.JasperException: org.apach

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Bugzilla is not a support forum. Please use the Apache Tomcat users' mailing
list.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.0.0-M4

[Rémy Maucherat]

On Fri, Apr 3, 2020 at 1:28 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 10.0.0-M4 release is now available for
> voting.
>
> Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
> package for all the specification APIs has changed from javax.* to
> jakarta.*
> Applications that run on Tomcat 9 will not run on Tomcat 10 without
> changes.
>
> The major changes compared to 10.0.0-M3  are:
>
> - Replace configuration via system property with configuration via an
>   attribute on the appropriate element where practical. A large number
>   of system properties have been replaced.
>
> - Add support for default values when using ${...} property replacement
>   in configuration files. Based on a pull request provided by Bernd
>   Bohmann.
>
> - Replace the system property
>   org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH with the
>   Connector attribute encodedSolidusHandling that adds an additional
>   option to pass the %2f sequence through to the application without
>   decoding it in addition to rejecting such sequences and decoding such
>   sequences.
>
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M4/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1261/
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.0-M4
> 772df65db45cfccc2aad33b9b51ef9ab14c19626
>
> The proposed 10.0.0-M4 release is:
> [ ] Broken - do not release
> [X] Alpha  - go ahead and release as 10.0.0-M4
>

Rémy

[Bug 64303] New: My Application is working fine in prev version of all tomcat, Planning to upgrade to 9.0.31 . I am running into the following issue.. Pls help org.apache.jasper.JasperException: org.

[bugzilla]

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

Bug ID: 64303
   Summary: My Application is working fine in prev version of all
tomcat, Planning to upgrade to 9.0.31 . I am running
into the following issue.. Pls help
org.apache.jasper.JasperException:
org.apache.jasper.JasperException: Unable to compile
class for JSP
   Product: Tomcat 9
   Version: 9.0.31
  Hardware: PC
OS: Linux
Status: NEW
  Severity: critical
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: sathisje...@gmail.com
  Target Milestone: -

My Application is working fine in prev version of all tomcat, Planning to
upgrade to 9.0.31
. I am running into the following issue.. Pls help

org.apache.jasper.JasperException: org.apache.jasper.JasperException: Unable to
compile class for JSP
   at
org.apache.jasper.servlet.JspServletWrapper.handleJspException(JspServletWrapper.java:605)
   at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:423)
Caused by: javax.el.ELException: Unable to find ExpressionFactory of type: #
Licensed to the Apache Software Foundation (ASF) under one or more
   at
javax.el.ExpressionFactory.newInstance(ExpressionFactory.java:152)
   at javax.el.ExpressionFactory.newInstance(ExpressionFactory.java:9
any idea on this .. in older version 9.0.19 applications are working fine

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE] Release Apache Tomcat 9.0.34

[Mark Thomas]

The proposed Apache Tomcat 9.0.34 release is now available for voting.

The major changes compared to the 9.0.34 release are:

- Add support for default values when using ${...} property replacement
  in configuration files. Based on a pull request provided by Bernd
  Bohmann.

- When configuring an HTTP Connector, warn if the encoding specified for
  URIEncoding is not a superset of US-ASCII as required by RFC7230.

- Replace the system property
  org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH with the
  Connector attribute encodedSolidusHandling that adds an additional
  option to pass the %2f sequence through to the application without
  decoding it in addition to rejecting such sequences and decoding such
  sequences.

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.34/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1263/
The tag is:
https://github.com/apache/tomcat/tree/9.0.34
1031a8edb864ac001a8f172161aa8a13b7a4e712

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

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

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_242; Windows 10 10.0)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.pom(SHA1: 6607494c2b2c5a3f76b3664c5dd432bb8f442914)/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.jar(SHA1: 3095eb27c1e6d75c2d66a78f52d772b107e50682)/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.jar.asc(SHA1: 24ea22609a6dfe4ccfa3442e615a440ef839a04c)/org/apache/tomcat/tomcat-i18n-de/9.0.34/tomcat-i18n-de-9.0.34.pom.asc(SHA1: 0fa93622b70b94a43726ecd5029d9749540c5102)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.pom.asc(SHA1: 92d008e5be815e0699448a36f20042284e0fb00f)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.jar(SHA1: 5616e268c634872572bbc4af2a1600fd77d5b8d1)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.jar.asc(SHA1: 3ef97172d73cb500db718ecc14ada41698c46642)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34.pom(SHA1: a26c272fd8368b49b18aa259c9350cfcf7c35e6e)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34-sources.jar.asc(SHA1: b1953c1fdcd74116f5da6bfcf2e76c2fee465f44)/org/apache/tomcat/tomcat-jni/9.0.34/tomcat-jni-9.0.34-sources.jar(SHA1: 0299da3c77723965103e7fbe887504b664b29e95)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.jar(SHA1: 7f095b3bcde2472c5284a279a5c0874a5504ae77)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34-sources.jar.asc(SHA1: 50b727f05a17ed3ad93e712852d0aa6b0de01e04)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.jar.asc(SHA1: 118a174811afde6ee77907824660bef4cde41856)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.pom.asc(SHA1: 9ea2f48a11541332555c4e9bfc4ca6e2348fe1a9)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34.pom(SHA1: b9a079f0ce5c90c58df95ad2a1c8f1b26dbaf451)/org/apache/tomcat/tomcat-juli/9.0.34/tomcat-juli-9.0.34-sources.jar(SHA1: d88eee84e889f6af6b04a4c8ed93daaf3b14eb26)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34-sources.jar.asc(SHA1: 5faf722b80792ef64f4d0cec7519a1f56a158ebf)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.pom.asc(SHA1: 754ae869bbfd10bec701cc347aeac636e065022b)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.pom(SHA1: ea9529409eddae6de095b03e8fbd0edd79b54356)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.jar(SHA1: 00e4717dd1597715e5ecd483e9dbd6fa3744a46b)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34.jar.asc(SHA1: 9c0d7eeb33f6a84157809db9e9f4e425cba060c9)/org/apache/tomcat/tomcat-util/9.0.34/tomcat-util-9.0.34-sources.jar(SHA1: 0605365a2824c2ec9c2c8072f87b02c188dda495)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.jar.asc(SHA1: c22990cdb2ef9bdb9bb25173a034261bfaa5b7fc)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.pom(SHA1: 94b5f9e8320ef546ba32f3a728a5b29cc93e0771)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.pom.asc(SHA1: 7b31171ebb541aa9a6da30a7db23f415a7071037)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34-sources.jar(SHA1: 5734d31192e4fab1dff646dafd76aa200f534e18)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34.jar(SHA1: 7574087f119d9dedc307a0d8c8025de130f1ec97)/org/apache/tomcat/tomcat-catalina/9.0.34/tomcat-catalina-9.0.34-sources.jar.asc(SHA1: 491be3b4409705704ab3b87276156fe45aca69be)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.pom(SHA1: e8396590678f8c83d3470be134ae8625358bfc82)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.pom.asc(SHA1: c9ea66c72b0227e793d39c28625427d026ffb97b)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.jar.asc(SHA1: 01a4b43af7ceda6ca624d2415ce2ca851ab767a0)/org/apache/tomcat/tomcat-i18n-fr/9.0.34/tomcat-i18n-fr-9.0.34.jar(SHA1: 81899c98a4dc189eb5a63cd77de1726e917eb236)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.jar(SHA1: a60cac71ce3f27a8e66a4e348b16c4ef903c8362)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.pom(SHA1: a80cad2ada32d5ad394f708f8a99adfa9f88fc5a)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.pom.asc(SHA1: 732dc5fe7df2c16792a63a501a9ae151ce5bc997)/org/apache/tomcat/tomcat-i18n-cs/9.0.34/tomcat-i18n-cs-9.0.34.jar.asc(SHA1: 104456f2b3df9401919b6557fffc69e111d16fa8)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34-sources.jar(SHA1: 4edeab9fa0f9f7ac2b110d47dfd24cfbd6a6a5c7)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34.jar.asc(SHA1: a041df48917afd8c79f6717132a82d0051b80004)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34.jar(SHA1: 79b6fcd8b73a592a96b9e42ced087fea5a795383)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34-sources.jar.asc(SHA1: 11fe37d972e399c40d913e0010bcfd992cfa8780)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34.pom(SHA1: 037a65cfa6a3f6e72bf1a802011581fa7bd5c2b8)/org/apache/tomcat/tomcat-jdbc/9.0.34/tomcat-jdbc-9.0.34.pom.asc(SHA1: 

Re: [VOTE] Release Apache Tomcat 10.0.0-M4

[Mark Thomas]

On 03/04/2020 12:28, Mark Thomas wrote:
> The proposed Apache Tomcat 10.0.0-M4 release is now available for
> voting.
> 
> Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
> package for all the specification APIs has changed from javax.* to jakarta.*
> Applications that run on Tomcat 9 will not run on Tomcat 10 without changes.
> 
> The major changes compared to 10.0.0-M3  are:
> 
> - Replace configuration via system property with configuration via an
>   attribute on the appropriate element where practical. A large number
>   of system properties have been replaced.
> 
> - Add support for default values when using ${...} property replacement
>   in configuration files. Based on a pull request provided by Bernd
>   Bohmann.
> 
> - Replace the system property
>   org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH with the
>   Connector attribute encodedSolidusHandling that adds an additional
>   option to pass the %2f sequence through to the application without
>   decoding it in addition to rejecting such sequences and decoding such
>   sequences.
> 
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M4/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1261/

Correction. It is:
https://repository.apache.org/content/repositories/orgapachetomcat-1262/

> The tag is:
> https://github.com/apache/tomcat/tree/10.0.0-M4
> 772df65db45cfccc2aad33b9b51ef9ab14c19626
> 
> The proposed 10.0.0-M4 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 10.0.0-M4
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_242; Windows 10 10.0)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.pom.asc(SHA1: 00451c156e0dbd358ca4a27f6c971ba1d7ef2d24)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.jar(SHA1: bda2267b02310f6e2b16baa4ba24fd1660beab26)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.pom(SHA1: 50121333bbd66414ae53bd59718907db524a4997)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M4/tomcat-i18n-de-10.0.0-M4.jar.asc(SHA1: 3cdc8ed7a9136f1a16ec76ec753159f4aebc9162)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.jar(SHA1: 4cbc608f77327dee2fcf2461495c74da6c84647e)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.pom(SHA1: a81424fd1193ab1d049f79ec7cb5cc9d490cbb77)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.jar.asc(SHA1: f388b602a7e807ff55318624ddfa54f8f512817b)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4.pom.asc(SHA1: 7c5523d2653259521ad383376f1bdb2ae310bd3b)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4-sources.jar(SHA1: a5822485afd00aeb2eb0fd2c834d2e5ee56cc8f5)/org/apache/tomcat/tomcat-jni/10.0.0-M4/tomcat-jni-10.0.0-M4-sources.jar.asc(SHA1: cd58967006ec77a4bc2407bb18a874c8773f56b9)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.jar(SHA1: 02fea581e680b46f07e9ab9bf8f88d0aad9e618b)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4-sources.jar(SHA1: 1fc7dfd99563f86a378fa05375a3e237b0d2957d)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.jar.asc(SHA1: 257ff2c520644943ea9a612826c71405e851536a)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.pom(SHA1: cdf2cef6ac6be1299dd859592338abfa4a74b77c)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4.pom.asc(SHA1: 02dea393fa886595b769b408ce8c1b15e0b8753e)/org/apache/tomcat/tomcat-juli/10.0.0-M4/tomcat-juli-10.0.0-M4-sources.jar.asc(SHA1: 2e6858d3b55a3bde521d1f687ca8965b06df39aa)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4-sources.jar(SHA1: c7ba7b7e8370fceb17b7e16548b0f0148f5dc588)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4-sources.jar.asc(SHA1: 9a3dbe5c2016153225f9c8c42a416f294d319c07)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.jar.asc(SHA1: be8421a8e5fd319893374fd03ba42e007f960eb3)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.pom.asc(SHA1: dc87204f5c37b5a626062e10e2f05d8d5e2f9dde)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.jar(SHA1: ad688e7dba13cd6d50f5be0c1bcc1ba8f0e5fc89)/org/apache/tomcat/tomcat-util/10.0.0-M4/tomcat-util-10.0.0-M4.pom(SHA1: a23446256b6a535f73453469ca9f99a24cb645d2)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.pom.asc(SHA1: 05fb469e6ec000e78aa29a21d90e607e422a46e5)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4-sources.jar(SHA1: 4da7df2f2143d0e7a10db82ba85466d4bb4af252)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4-sources.jar.asc(SHA1: 07d421611b9af889d4642ca9c7bbd1deaf08ff5c)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.jar(SHA1: 48b91b6904e60114959650e9e75b4c8e95be7027)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.jar.asc(SHA1: f865fa395bbdfe74c4625c2d0ed77b5b7a678fda)/org/apache/tomcat/tomcat-catalina/10.0.0-M4/tomcat-catalina-10.0.0-M4.pom(SHA1: a29b451174e26d6672d9af95ff1a7802103d0ddd)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.jar(SHA1: b3cb41c6ea1254a4bdf7ab05198d3d9adfa44e86)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.jar.asc(SHA1: 2e38d49c61ddbf2c206a1d27928404042bf6e63e)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.pom(SHA1: 0899ad1371e0c1efd3ccb683414aa4e6356176a6)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M4/tomcat-i18n-fr-10.0.0-M4.pom.asc(SHA1: 448258c412fead9642dfb019fd87b3dc9adc7484)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.jar.asc(SHA1: cf2677200801647f079589fac023b144f8848a2a)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.jar(SHA1: 8442e9c9b6344cadd3ef51a3ea8365307a699df9)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.pom(SHA1: e25e08ac2fea426fbdbc1d5861dbf4621cc8cf38)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M4/tomcat-i18n-cs-10.0.0-M4.pom.asc(SHA1: 777b18bd31aa9f3e332f7019f0d97884a8d899a8)/org/apache/tomcat/tomcat-jdbc/10.0.0-M4/tomcat-jdbc-10.0.0-M4.jar.asc(SHA1: f6d93f98082f522edacc14b1bc87c01887581106)/org/apache/tomcat/tomcat-jdbc/10.0.0-M4/tomcat-jdbc-10.0.0-M4-sources.jar(SHA1: 0ecbe65acdb98c37d88b9e6a53f2daf9e356b656)/org/apache/tomcat/tomcat-jdbc/10.0.0-M4/tomcat-jdbc-10.0.0-M4.pom.asc(SHA1: 

Nexus: Staging Repository Dropped

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_242; Windows 10 10.0)""userId" = "markt""ip" = "86.190.55.221"Details:The orgapachetomcat-1261 staging repository has been dropped.Action performed by Mark Thomas (markt)

svn commit: r38799 - in /dev/tomcat/tomcat-9/v9.0.34: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Fri Apr  3 12:17:30 2020
New Revision: 38799

Log:
Upload 9.0.34 for voting

Added:
dev/tomcat/tomcat-9/v9.0.34/
dev/tomcat/tomcat-9/v9.0.34/KEYS
dev/tomcat/tomcat-9/v9.0.34/README.html
dev/tomcat/tomcat-9/v9.0.34/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.34/bin/
dev/tomcat/tomcat-9/v9.0.34/bin/README.html
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.exe   (with props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.exe.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.exe.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.zip   (with props)
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.zip.asc
dev/tomcat/tomcat-9/v9.0.34/bin/apache-tomcat-9.0.34.zip.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/embed/
dev/tomcat/tomcat-9/v9.0.34/bin/embed/apache-tomcat-9.0.34-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.34/bin/embed/apache-tomcat-9.0.34-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.34/bin/embed/apache-tomcat-9.0.34-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.34/bin/embed/apache-tomcat-9.0.34-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.34/bin/embed/apache-tomcat-9.0.34-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.34/bin/embed/apache-tomcat-9.0.34-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.34/src/
dev/tomcat/tomcat-9/v9.0.34/src/apache-tomcat-9.0.34-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.34/src/apache-tomcat-9.0.34-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.34/src/apache-tomcat-9.0.34-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.34/src/apache-tomcat-9.0.34-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.34/src/apache-tomcat-9.0.34-src.zip.asc
dev/tomcat/tomcat-9/v9.0.34/src/apache-tomcat-9.0.34-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.34/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.34/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.34/KEYS Fri Apr  3 12:17:30 2020
@@ -0,0 +1,676 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT

svn commit: r38798 - in /release/tomcat: tomcat-10/v10.0.0-M1/ tomcat-8/v8.5.51/ tomcat-9/v9.0.31/

[markt]

Author: markt
Date: Fri Apr  3 12:17:26 2020
New Revision: 38798

Log:
Remove old releases from mirrors

Removed:
release/tomcat/tomcat-10/v10.0.0-M1/
release/tomcat/tomcat-8/v8.5.51/
release/tomcat/tomcat-9/v9.0.31/


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

[tomcat] tag 9.0.34 created (now 1031a8e)

[markt]

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

markt pushed a change to tag 9.0.34
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 1031a8e  (commit)
This tag includes the following new commits:

 new 1031a8e  Tag 9.0.34

The 1 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.



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

[tomcat] 01/01: Tag 9.0.34

[markt]

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

markt pushed a commit to tag 9.0.34
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 1031a8edb864ac001a8f172161aa8a13b7a4e712
Author: Mark Thomas 
AuthorDate: Fri Apr 3 13:01:00 2020 +0100

Tag 9.0.34
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7d2404e..2c86c9b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=34
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 81a5d6b..9497522 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   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/01: Tag 9.0.34

[markt]

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

markt pushed a commit to tag 9.0.34
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 9ab1ba4f873a5815275d83d2ec3b30e988059b2c
Author: Mark Thomas 
AuthorDate: Fri Apr 3 12:58:21 2020 +0100

Tag 9.0.34
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7d2404e..2c86c9b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=34
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b50f759..6bba1df 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   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] tag 9.0.34 created (now 9ab1ba4)

[markt]

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

markt pushed a change to tag 9.0.34
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 9ab1ba4  (commit)
This tag includes the following new commits:

 new 9ab1ba4  Tag 9.0.34

The 1 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.



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

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 8c0183441177744e65c5bf02fa49f6ec4e7c4de8
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

[VOTE] Release Apache Tomcat 10.0.0-M4

[Mark Thomas]

The proposed Apache Tomcat 10.0.0-M4 release is now available for
voting.

Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
package for all the specification APIs has changed from javax.* to jakarta.*
Applications that run on Tomcat 9 will not run on Tomcat 10 without changes.

The major changes compared to 10.0.0-M3  are:

- Replace configuration via system property with configuration via an
  attribute on the appropriate element where practical. A large number
  of system properties have been replaced.

- Add support for default values when using ${...} property replacement
  in configuration files. Based on a pull request provided by Bernd
  Bohmann.

- Replace the system property
  org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH with the
  Connector attribute encodedSolidusHandling that adds an additional
  option to pass the %2f sequence through to the application without
  decoding it in addition to rejecting such sequences and decoding such
  sequences.


Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M4/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1261/
The tag is:
https://github.com/apache/tomcat/tree/10.0.0-M4
772df65db45cfccc2aad33b9b51ef9ab14c19626

The proposed 10.0.0-M4 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 10.0.0-M4

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

[tomcat] branch 8.5.x updated: Fix typo

[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 489ad17  Fix typo
489ad17 is described below

commit 489ad1737489c3980ee40654697fc30e68112a99
Author: Mark Thomas 
AuthorDate: Fri Apr 3 12:23:52 2020 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8adb17f..ccfb07a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,7 +72,7 @@
   
   
 64265: Fix ETag comparison performed by the default servlet.
-The default servley always uses weak comparison. (markt)
+The default servlet always uses weak comparison. (markt)
   
   
 Add support for default values when using ${...} property


-
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 typo

[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 e73925c  Fix typo
e73925c is described below

commit e73925ca3c26dbf1c049609e2bb8c7e544a41e11
Author: Mark Thomas 
AuthorDate: Fri Apr 3 12:23:52 2020 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dc99f88..79e9f9f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -73,7 +73,7 @@
   
   
 64265: Fix ETag comparison performed by the default servlet.
-The default servley always uses weak comparison. (markt)
+The default servlet always uses weak comparison. (markt)
   
   
 Add support for default values when using ${...} property


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

[tomcat] branch 9.0.x updated: Fix typo

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new d68bae8  Fix typo
d68bae8 is described below

commit d68bae893e7c1d31fed0963783aea06bce4dd28b
Author: Mark Thomas 
AuthorDate: Fri Apr 3 12:23:52 2020 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b50f759..81a5d6b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,7 +72,7 @@
   
   
 64265: Fix ETag comparison performed by the default servlet.
-The default servley always uses weak comparison. (markt)
+The default servlet always uses weak comparison. (markt)
   
   
 Add support for default values when using ${...} property


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

[tomcat] branch master updated: Fix typo

[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 8c01834  Fix typo
8c01834 is described below

commit 8c0183441177744e65c5bf02fa49f6ec4e7c4de8
Author: Mark Thomas 
AuthorDate: Fri Apr 3 12:23:52 2020 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fd64a5c..0241d8a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,7 +119,7 @@
   
   
 64265: Fix ETag comparison performed by the default servlet.
-The default servley always uses weak comparison. (markt)
+The default servlet always uses weak comparison. (markt)
   
   
 Remove


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

svn commit: r38794 - in /dev/tomcat/tomcat-10/v10.0.0-M4: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Fri Apr  3 11:20:50 2020
New Revision: 38794

Log:
Upload 10.0.0-M4 for voting

Added:
dev/tomcat/tomcat-10/v10.0.0-M4/
dev/tomcat/tomcat-10/v10.0.0-M4/KEYS
dev/tomcat/tomcat-10/v10.0.0-M4/README.html
dev/tomcat/tomcat-10/v10.0.0-M4/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.0-M4/bin/
dev/tomcat/tomcat-10/v10.0.0-M4/bin/README.html
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-deployer.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-deployer.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-fulldocs.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-windows-x64.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-windows-x86.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.exe   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.exe.asc
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.exe.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/embed/

dev/tomcat/tomcat-10/v10.0.0-M4/bin/embed/apache-tomcat-10.0.0-M4-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.0.0-M4/bin/embed/apache-tomcat-10.0.0-M4-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M4/bin/embed/apache-tomcat-10.0.0-M4-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/bin/embed/apache-tomcat-10.0.0-M4-embed.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M4/bin/embed/apache-tomcat-10.0.0-M4-embed.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M4/bin/embed/apache-tomcat-10.0.0-M4-embed.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/src/
dev/tomcat/tomcat-10/v10.0.0-M4/src/apache-tomcat-10.0.0-M4-src.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.0-M4/src/apache-tomcat-10.0.0-M4-src.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M4/src/apache-tomcat-10.0.0-M4-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M4/src/apache-tomcat-10.0.0-M4-src.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M4/src/apache-tomcat-10.0.0-M4-src.zip.asc
dev/tomcat/tomcat-10/v10.0.0-M4/src/apache-tomcat-10.0.0-M4-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.0.0-M4/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.0-M4/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.0-M4/KEYS Fri Apr  3 11:20:50 2020
@@ -0,0 +1,676 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC

[tomcat] tag 10.0.0-M4 created (now 772df65)

[markt]

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

markt pushed a change to tag 10.0.0-M4
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 772df65  (commit)
This tag includes the following new commits:

 new 772df65  Tag 10.0.0-M4

The 1 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.



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

[tomcat] 01/01: Tag 10.0.0-M4

[markt]

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

markt pushed a commit to tag 10.0.0-M4
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 772df65db45cfccc2aad33b9b51ef9ab14c19626
Author: Mark Thomas 
AuthorDate: Fri Apr 3 11:51:08 2020 +0100

Tag 10.0.0-M4
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 33b1fbe..0724dce 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M4-dev
+version.suffix=-M4
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fd64a5c..3beba7f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   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 7.0.x updated: Document another system property in websockets

[remm]

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

remm 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 7ff51ab  Document another system property in websockets
7ff51ab is described below

commit 7ff51abc0d1737327317df142a945fc692001725
Author: remm 
AuthorDate: Fri Apr 3 11:11:16 2020 +0200

Document another system property in websockets
---
 webapps/docs/config/systemprops.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index 928391b..556298e 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -603,6 +603,11 @@
   The default value is false.
 
 
+
+  The default size for buffers used in the Websockets container.
+  The default value is 8192 which corresponds to 8KB.
+
+
 
   Default value of the origin header that will be sent by the client
  during the upgrade handshake.


-
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: Document another system property in websockets

[remm]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new afbf263  Document another system property in websockets
afbf263 is described below

commit afbf263b188aaf8644e54501af67a0cd349f2ffb
Author: remm 
AuthorDate: Fri Apr 3 11:11:16 2020 +0200

Document another system property in websockets
---
 webapps/docs/config/systemprops.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index f047a39..d547929 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -546,6 +546,11 @@
   The default value is false.
 
 
+
+  The default size for buffers used in the Websockets container.
+  The default value is 8192 which corresponds to 8KB.
+
+
 
   Default value of the origin header that will be sent by the client
  during the upgrade handshake.


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

[tomcat] branch 9.0.x updated: Document another system property in websockets

[remm]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 81f23f1  Document another system property in websockets
81f23f1 is described below

commit 81f23f1abe269e736edc349f0d1567ea22ca63cd
Author: remm 
AuthorDate: Fri Apr 3 11:11:16 2020 +0200

Document another system property in websockets
---
 webapps/docs/config/systemprops.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index 75ce6e7..c0b4e7a 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -543,6 +543,11 @@
   The default value is false.
 
 
+
+  The default size for buffers used in the Websockets container.
+  The default value is 8192 which corresponds to 8KB.
+
+
 
   Default value of the origin header that will be sent by the client
  during the upgrade handshake.


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

[tomcat] branch master updated: Document another system property in websockets

[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 808a5f1  Document another system property in websockets
808a5f1 is described below

commit 808a5f10427af94c25df02c9ced1f7b986e1cd03
Author: remm 
AuthorDate: Fri Apr 3 11:11:16 2020 +0200

Document another system property in websockets
---
 webapps/docs/config/systemprops.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index f7dc92c..2a15d9d 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -280,6 +280,11 @@
   The default value is false.
 
 
+
+  The default size for buffers used in the Websockets container.
+  The default value is 8192 which corresponds to 8KB.
+
+
 
   Default value of the origin header that will be sent by the client
  during the upgrade handshake.


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

[tomcat] 01/05: Log exceptions when closing the server socket and don't re-throw

[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 650cb85ad2871a108c142be7ebf2de67687fe887
Author: Mark Thomas 
AuthorDate: Thu Apr 2 21:23:51 2020 +0100

Log exceptions when closing the server socket and don't re-throw

Running the unit tests on MacOS I saw a test failure caused by an
exception as this point. I've never seen an exception here before. It
certainly isn't repeatable. On balance, logging the exception and
completing the rest of the Connector shutdown cleanly looks to be the
better option.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 4e67f7e..a50b721 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -330,7 +330,11 @@ public class NioEndpoint extends 
AbstractJsseEndpoint {
 if (running) {
 stop();
 }
-doCloseServerSocket();
+try {
+doCloseServerSocket();
+} catch (IOException ioe) {
+getLog().warn(sm.getString("endpoint.serverSocket.closeFailed", 
getName()), ioe);
+}
 destroySsl();
 super.unbind();
 if (getHandler() != null ) {


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

[tomcat] 03/05: Fix IDE warning

[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 bbf0a02f04b4ca1d8d9228c74717a95ea56117d9
Author: Mark Thomas 
AuthorDate: Sat Mar 7 10:14:45 2020 +

Fix IDE warning
---
 test/org/apache/tomcat/util/net/TestSsl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index 91598fb..1736b49 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -94,6 +94,7 @@ public class TestSsl extends TomcatBaseTest {
 AtomicInteger errorCount = new AtomicInteger(0);
 for (int i = 0; i < iterations; i++) {
 new Thread() {
+@Override
 public void run() {
 try {
 SSLSocket socket = (SSLSocket) 
socketFactory.createSocket("localhost",


-
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 (3031d06 -> b18e764)

[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 3031d06  Improve code coverage
 new 650cb85  Log exceptions when closing the server socket and don't 
re-throw
 new e0fdcfe  Expand SSL POST test to exercise the poller more
 new bbf0a02  Fix IDE warning
 new e1a7fbc  Failed test on Windows. Expand logging to aid debugging of 
failures.
 new b18e764  Changes required for Java 7

The 5 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:
 java/org/apache/tomcat/util/net/NioEndpoint.java |  6 +-
 test/org/apache/tomcat/util/net/TestSsl.java | 94 +++-
 2 files changed, 66 insertions(+), 34 deletions(-)


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

[tomcat] 04/05: Failed test on Windows. Expand logging to aid debugging of failures.

[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 e1a7fbc09a72bee3b0f28cd61dd80343ce163635
Author: Mark Thomas 
AuthorDate: Thu Apr 2 21:37:48 2020 +0100

Failed test on Windows. Expand logging to aid debugging of failures.
---
 test/org/apache/tomcat/util/net/TestSsl.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index 1736b49..ae23179 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -128,14 +128,17 @@ public class TestSsl extends TomcatBaseTest {
 }
 }
 
-for (byte c : bytes) {
+for (int i = 0; i < bytes.length; i++) {
 int read = is.read();
-if (c != read) {
+if (bytes[i] != read) {
+System.err.print("Byte in position [" + i + "] 
had value [" + read +
+"] rather than " + 
Byte.toString(bytes[i]));
 errorCount.incrementAndGet();
 break;
 }
 }
 } catch (Exception e) {
+e.printStackTrace();
 errorCount.incrementAndGet();
 } finally {
 latch.countDown();


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

[tomcat] 05/05: Changes required for Java 7

[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 b18e764ec83a6a98af3d9ef2576b91049f2345f8
Author: Mark Thomas 
AuthorDate: Fri Apr 3 09:26:07 2020 +0100

Changes required for Java 7
---
 test/org/apache/tomcat/util/net/TestSsl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index ae23179..b072106 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -80,7 +80,7 @@ public class TestSsl extends TomcatBaseTest {
 
 @Test
 public void testPost() throws Exception {
-SocketFactory socketFactory = TesterSupport.configureClientSsl();
+final SocketFactory socketFactory = TesterSupport.configureClientSsl();
 
 Tomcat tomcat = getTomcatInstance();
 TesterSupport.initSsl(tomcat);
@@ -90,8 +90,8 @@ public class TestSsl extends TomcatBaseTest {
 ctxt.addServletMappingDecoded("/post", "post");
 tomcat.start();
 int iterations = 8;
-CountDownLatch latch = new CountDownLatch(iterations);
-AtomicInteger errorCount = new AtomicInteger(0);
+final CountDownLatch latch = new CountDownLatch(iterations);
+final AtomicInteger errorCount = new AtomicInteger(0);
 for (int i = 0; i < iterations; i++) {
 new Thread() {
 @Override


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

[tomcat] 02/05: Expand SSL POST test to exercise the poller more

[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 e0fdcfef203eff408c940b6b22e4aec5b0679028
Author: remm 
AuthorDate: Fri Mar 6 16:55:39 2020 +0100

Expand SSL POST test to exercise the poller more

No issue found so far.
---
 test/org/apache/tomcat/util/net/TestSsl.java | 88 ++--
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index f167c6c..91598fb 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -24,6 +24,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.HandshakeCompletedEvent;
@@ -87,39 +89,61 @@ public class TestSsl extends TomcatBaseTest {
 Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
 ctxt.addServletMappingDecoded("/post", "post");
 tomcat.start();
-
-SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
-getPort());
-
-OutputStream os = socket.getOutputStream();
-
-byte[] bytes = new byte[1024 * 1024]; // 1MB
-Arrays.fill(bytes, (byte) 1);
-
-os.write("POST /post HTTP/1.1\r\n".getBytes());
-os.write("Host: localhost\r\n".getBytes());
-os.write("Content-Length: 1048576\r\n\r\n".getBytes());
-os.write(bytes);
-os.flush();
-
-InputStream is = socket.getInputStream();
-
-// Skip to the end of the headers
-byte[] endOfHeaders = "\r\n\r\n".getBytes();
-int found = 0;
-while (found != endOfHeaders.length) {
-if (is.read() == endOfHeaders[found]) {
-found++;
-} else {
-found = 0;
-}
-}
-
-for (byte c : bytes) {
-int read = is.read();
-Assert.assertEquals(c, read);
+int iterations = 8;
+CountDownLatch latch = new CountDownLatch(iterations);
+AtomicInteger errorCount = new AtomicInteger(0);
+for (int i = 0; i < iterations; i++) {
+new Thread() {
+public void run() {
+try {
+SSLSocket socket = (SSLSocket) 
socketFactory.createSocket("localhost",
+getPort());
+
+OutputStream os = socket.getOutputStream();
+
+byte[] bytes = new byte[16 * 1024 * 1024]; // 16MB
+Arrays.fill(bytes, (byte) 1);
+
+os.write("POST /post HTTP/1.1\r\n".getBytes());
+os.write("Host: localhost\r\n".getBytes());
+os.write(("Content-Length: " + 
Integer.valueOf(bytes.length) + "\r\n\r\n").getBytes());
+// Write in 128KB blocks
+for (int i = 0; i < bytes.length / (128 * 1024); i++) {
+os.write(bytes, 0, 1024 * 128);
+Thread.sleep(10);
+}
+os.flush();
+
+InputStream is = socket.getInputStream();
+
+// Skip to the end of the headers
+byte[] endOfHeaders = "\r\n\r\n".getBytes();
+int found = 0;
+while (found != endOfHeaders.length) {
+if (is.read() == endOfHeaders[found]) {
+found++;
+} else {
+found = 0;
+}
+}
+
+for (byte c : bytes) {
+int read = is.read();
+if (c != read) {
+errorCount.incrementAndGet();
+break;
+}
+}
+} catch (Exception e) {
+errorCount.incrementAndGet();
+} finally {
+latch.countDown();
+}
+}
+}.start();
 }
-
+latch.await();
+Assert.assertEquals(0, errorCount.get());
 }
 
 @Test


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

[tomcat] 03/04: Fix IDE warning

[markt]

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

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

commit 536315b9f321fc296da90ec07c55bfe8bf198aca
Author: Mark Thomas 
AuthorDate: Sat Mar 7 10:14:45 2020 +

Fix IDE warning
---
 test/org/apache/tomcat/util/net/TestSsl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index 91598fb..1736b49 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -94,6 +94,7 @@ public class TestSsl extends TomcatBaseTest {
 AtomicInteger errorCount = new AtomicInteger(0);
 for (int i = 0; i < iterations; i++) {
 new Thread() {
+@Override
 public void run() {
 try {
 SSLSocket socket = (SSLSocket) 
socketFactory.createSocket("localhost",


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

[tomcat] 01/04: Log exceptions when closing the server socket and don't re-throw

[markt]

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

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

commit 89db08869ba51ad608c5c4dcb924e0bde7b2fc6b
Author: Mark Thomas 
AuthorDate: Thu Apr 2 21:23:51 2020 +0100

Log exceptions when closing the server socket and don't re-throw

Running the unit tests on MacOS I saw a test failure caused by an
exception as this point. I've never seen an exception here before. It
certainly isn't repeatable. On balance, logging the exception and
completing the rest of the Connector shutdown cleanly looks to be the
better option.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 3e82123..9f6654f 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -332,7 +332,11 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 if (running) {
 stop();
 }
-doCloseServerSocket();
+try {
+doCloseServerSocket();
+} catch (IOException ioe) {
+getLog().warn(sm.getString("endpoint.serverSocket.closeFailed", 
getName()), ioe);
+}
 destroySsl();
 super.unbind();
 if (getHandler() != null ) {


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

[tomcat] branch 9.0.x updated (34eefd0 -> f8da18d)

[markt]

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

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


from 34eefd0  Improve code coverage
 new 89db088  Log exceptions when closing the server socket and don't 
re-throw
 new a494c8b  Expand SSL POST test to exercise the poller more
 new 536315b  Fix IDE warning
 new f8da18d  Failed test on Windows. Expand logging to aid debugging of 
failures.

The 4 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:
 java/org/apache/tomcat/util/net/NioEndpoint.java |  6 +-
 test/org/apache/tomcat/util/net/TestSsl.java | 92 +++-
 2 files changed, 65 insertions(+), 33 deletions(-)


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

[tomcat] 04/04: Failed test on Windows. Expand logging to aid debugging of failures.

[markt]

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

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

commit f8da18d362b8a773afd557fdda0fe50a3748c90c
Author: Mark Thomas 
AuthorDate: Thu Apr 2 21:37:48 2020 +0100

Failed test on Windows. Expand logging to aid debugging of failures.
---
 test/org/apache/tomcat/util/net/TestSsl.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index 1736b49..ae23179 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -128,14 +128,17 @@ public class TestSsl extends TomcatBaseTest {
 }
 }
 
-for (byte c : bytes) {
+for (int i = 0; i < bytes.length; i++) {
 int read = is.read();
-if (c != read) {
+if (bytes[i] != read) {
+System.err.print("Byte in position [" + i + "] 
had value [" + read +
+"] rather than " + 
Byte.toString(bytes[i]));
 errorCount.incrementAndGet();
 break;
 }
 }
 } catch (Exception e) {
+e.printStackTrace();
 errorCount.incrementAndGet();
 } finally {
 latch.countDown();


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

[tomcat] 02/04: Expand SSL POST test to exercise the poller more

[markt]

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

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

commit a494c8b34262957d0aa53420aced429bda7ffd8d
Author: remm 
AuthorDate: Fri Mar 6 16:55:39 2020 +0100

Expand SSL POST test to exercise the poller more

No issue found so far.
---
 test/org/apache/tomcat/util/net/TestSsl.java | 88 ++--
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index f167c6c..91598fb 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -24,6 +24,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.HandshakeCompletedEvent;
@@ -87,39 +89,61 @@ public class TestSsl extends TomcatBaseTest {
 Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
 ctxt.addServletMappingDecoded("/post", "post");
 tomcat.start();
-
-SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
-getPort());
-
-OutputStream os = socket.getOutputStream();
-
-byte[] bytes = new byte[1024 * 1024]; // 1MB
-Arrays.fill(bytes, (byte) 1);
-
-os.write("POST /post HTTP/1.1\r\n".getBytes());
-os.write("Host: localhost\r\n".getBytes());
-os.write("Content-Length: 1048576\r\n\r\n".getBytes());
-os.write(bytes);
-os.flush();
-
-InputStream is = socket.getInputStream();
-
-// Skip to the end of the headers
-byte[] endOfHeaders = "\r\n\r\n".getBytes();
-int found = 0;
-while (found != endOfHeaders.length) {
-if (is.read() == endOfHeaders[found]) {
-found++;
-} else {
-found = 0;
-}
-}
-
-for (byte c : bytes) {
-int read = is.read();
-Assert.assertEquals(c, read);
+int iterations = 8;
+CountDownLatch latch = new CountDownLatch(iterations);
+AtomicInteger errorCount = new AtomicInteger(0);
+for (int i = 0; i < iterations; i++) {
+new Thread() {
+public void run() {
+try {
+SSLSocket socket = (SSLSocket) 
socketFactory.createSocket("localhost",
+getPort());
+
+OutputStream os = socket.getOutputStream();
+
+byte[] bytes = new byte[16 * 1024 * 1024]; // 16MB
+Arrays.fill(bytes, (byte) 1);
+
+os.write("POST /post HTTP/1.1\r\n".getBytes());
+os.write("Host: localhost\r\n".getBytes());
+os.write(("Content-Length: " + 
Integer.valueOf(bytes.length) + "\r\n\r\n").getBytes());
+// Write in 128KB blocks
+for (int i = 0; i < bytes.length / (128 * 1024); i++) {
+os.write(bytes, 0, 1024 * 128);
+Thread.sleep(10);
+}
+os.flush();
+
+InputStream is = socket.getInputStream();
+
+// Skip to the end of the headers
+byte[] endOfHeaders = "\r\n\r\n".getBytes();
+int found = 0;
+while (found != endOfHeaders.length) {
+if (is.read() == endOfHeaders[found]) {
+found++;
+} else {
+found = 0;
+}
+}
+
+for (byte c : bytes) {
+int read = is.read();
+if (c != read) {
+errorCount.incrementAndGet();
+break;
+}
+}
+} catch (Exception e) {
+errorCount.incrementAndGet();
+} finally {
+latch.countDown();
+}
+}
+}.start();
 }
-
+latch.await();
+Assert.assertEquals(0, errorCount.get());
 }
 
 @Test


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