date:20200115

[tomcat] branch master updated: Jakarta EE 9 is has a minimum of Java 8

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 916d449  Jakarta EE 9 is has a minimum of Java 8
916d449 is described below

commit 916d449dee36d58eba70ced1f9a0f968cf119255
Author: Mark Thomas 
AuthorDate: Wed Jan 15 23:25:51 2020 +

Jakarta EE 9 is has a minimum of Java 8
---
 TOMCAT-NEXT.txt | 32 ++--
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index 9839498..e52ab6c 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -25,7 +25,7 @@ Items carried over from the 9.0.x list:
 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:
+New items for 10.0.0.x onwards:
 
  1.  Remove APR connector.
 
@@ -34,33 +34,37 @@ New items for 10.0.x onwards:
  We might want to park this one until we see what is available direct from
  the JRE with project Panama.
 
- 3.  Remove the ExtensionValidator and associated classes (assuming that the
- minimum Java version is Java 9 or later).
-
- 4.  Clean-up content-type header processing. Remove the optional space after
+ 3.  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.
 
- 5.  Consider applying the delayed log file opening (until there is something 
to
+ 4.  Consider applying the delayed log file opening (until there is something 
to
  log). See BZ 53620.
 
- 6. Consider including
+ 5. Consider including
 UTF-8
 in conf/web.xml
 
- 7. Consider including
+ 6. Consider including
 UTF-8
 in conf/web.xml
 
- 8. RFC 3986 states (section 2.2) that a %nn encoded delimiter is NOT 
equivalent
+ 7. 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.
 
- 9. BZ 56966. Refactor internal request timing to use System.nanoTime()
+ 8. BZ 56966. Refactor internal request timing to use System.nanoTime()
+
+ 9. BZ 63286. Make behaviour of %D and %T consistent with httpd.
 
-10. BZ 63286. Make behaviour of %D and %T consistent with httpd.
+10. Refactor DefaultServlet to use Ranges in parseRanges().
 
-11. Refactor DefaultServlet to use Ranges in parseRanges().
+11. Consider disabling the AJP connector by default.
 
-12. Consider disabling the AJP connector by default.
+12. Share configuration between HTTP/1.1 and nested HTTP/2 rather than 
duplicating.
+
+
+Deferred until 10.0.x:
+
+ 1.  Remove the ExtensionValidator and associated classes (assuming that the
+ minimum Java version is Java 9 or later).
 
-13. Share configuration between HTTP/1.1 and nested HTTP/2 rather than 
duplicating.


-
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: Only master needs export

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 89edf9a  Only master needs export
89edf9a is described below

commit 89edf9a53f0f316852e591aad205aa951c487fd9
Author: Mark Thomas 
AuthorDate: Wed Jan 15 20:15:10 2020 +

Only master needs export
---
 .../apache/tomcat/buildutil/translate/Export.java  | 56 --
 1 file changed, 56 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Export.java 
b/java/org/apache/tomcat/buildutil/translate/Export.java
deleted file mode 100644
index b05ee13..000
--- a/java/org/apache/tomcat/buildutil/translate/Export.java
+++ /dev/null
@@ -1,56 +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.tomcat.buildutil.translate;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Generates a single properties file per language for import into a 
translation
- * tool.
- */
-public class Export {
-
-private static final Map translations = new HashMap<>();
-
-public static void main(String... args) throws IOException {
-File root = new File(".");
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(dir);
-Utils.processDirectory(root, directory, translations);
-}
-
-outputTranslations();
-}
-
-
-private static void outputTranslations() {
-
-File storageDir = new File(Constants.STORAGE_DIR);
-if (!storageDir.exists()) {
-storageDir.mkdirs();
-}
-
-for (Map.Entry translationEntry : 
translations.entrySet()) {
- Utils.export(translationEntry.getKey(), 
translationEntry.getValue(), storageDir);
-}
-}
-}
-


-
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: Tab police

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 7aaf5a7  Tab police
7aaf5a7 is described below

commit 7aaf5a7f5e97063359286b4ffa0fee2745190080
Author: Mark Thomas 
AuthorDate: Wed Jan 15 22:47:18 2020 +

Tab police
---
 java/org/apache/catalina/ha/session/DeltaManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 130b158..51c06f2 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -490,7 +490,7 @@ public class DeltaManager extends ClusterManagerBase{
 
 @Override
 public void changeSessionId(Session session) {
-   rotateSessionId(session, true);
+rotateSessionId(session, true);
 }
 
 @Override


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

Re: Tomcat 7.0.x end of life

2020-01-15 Thread Michael Osipov


Am 2020-01-14 um 21:56 schrieb Mark Thomas:

Hi all,

This has been mentioned several times as we have figured out our
approach to Jakarta EE 9 and Tomcat 10. I'd like to formally propose
that we announce end of life for Tomcat 7.0.x as 31 March 2021.


+1

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

[Bug 62971] Revert the fix for 49464 in tomcat 9

2020-01-15 Thread bugzilla

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

--- Comment #7 from fuminz...@crd.com ---
Note that in debug that encountered the problem (in my particular case anyway),
in the DefaultServlet.java, even when:
outputEncoding != org.apache.coyote.Constants.DEFAULT_BODY_CHARSET.name()
becomes true, the contents of both sides are actually the same.  -This and the
flush looks to be the logic for the 49464 fix.

Which makes this fix suspicious.  - Locally changing the "!=" to ".equals(..)"
would make the issue go away.

-- 
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 62971] Revert the fix for 49464 in tomcat 9

2020-01-15 Thread bugzilla

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

--- Comment #6 from fuminz...@crd.com ---
It turns out the issue behavior is not related to struts/tiles/action. I am
able to develop a simple jsp that encounter the issue - still want to trim down
further before I submit the pacakge.  But it does require to use tag lib
http://java.sun.com/jsp/jstl/fmt, with javax.servlet.jsp.jstl-1.2.3.jar.

In debug, it looks the fmt:setLocale would cause an CharacterEncoding (for
en-US) to be set on the Response, which in turn, at the code for bug 49464,
would cause:
outputEncoding != org.apache.coyote.Constants.DEFAULT_BODY_CHARSET.name()
to be true, which triggers the outputEncodingSpecified pw.flush to happen.

and with the ImportSupport from javax.servlet.jsp.jstl-1.2.3.jar looks not able
to deal with the flushed irw, while the taglibs-standard-impl-1.2.5 appears to
be able to handle it - these I have not debugged into.

-- 
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 9.0.x updated (581b30f -> c8c99bd)

2020-01-15 Thread 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 581b30f  Align master, 9.0.x and 8.5.x
 new 350f3cf  Use setProperty and test return value in preference to 
setAttribute
 new b9da643  pollerThreadCount does not exist for APR
 new c8c99bd  Deprecate pollerThreadCount

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:
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../apache/coyote/http11/Http11NioProtocol.java| 11 +++
 .../connector/TestCoyoteAdapterRequestFuzzing.java |  2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |  3 +-
 .../apache/catalina/core/TestStandardService.java  |  3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |  2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|  6 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 34 +++---
 .../util/http/TestMimeHeadersIntegration.java  |  3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  2 +-
 .../tomcat/websocket/TestConnectionLimit.java  |  3 +-
 11 files changed, 40 insertions(+), 31 deletions(-)


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

[tomcat] 01/03: Use setProperty and test return value in preference to setAttribute

2020-01-15 Thread markt

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

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

commit 350f3cf2106c88f6574998b1d3bc69edeaa1284b
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:40:52 2020 +

Use setProperty and test return value in preference to setAttribute
---
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../connector/TestCoyoteAdapterRequestFuzzing.java |  2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |  3 +-
 .../apache/catalina/core/TestStandardService.java  |  3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |  2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|  7 ++---
 .../apache/coyote/http11/TestHttp11Processor.java  | 34 +++---
 .../util/http/TestMimeHeadersIntegration.java  |  3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  2 +-
 .../tomcat/websocket/TestConnectionLimit.java  |  3 +-
 10 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 79628e0..b553b4c 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1013,7 +1013,7 @@ public class ApplicationContext implements ServletContext 
{
 Connector[] connectors = service.findConnectors();
 // Need at least one SSL enabled connector to use the SSL session ID.
 for (Connector connector : connectors) {
-if (Boolean.TRUE.equals(connector.getAttribute("SSLEnabled"))) {
+if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
 supportedSessionTrackingModes.add(SessionTrackingMode.SSL);
 break;
 }
diff --git 
a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java 
b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
index dc8ac5e..f2edf46 100644
--- a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
+++ b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
@@ -110,7 +110,7 @@ public class TestCoyoteAdapterRequestFuzzing extends 
TomcatBaseTest {
 @Test
 public void doTest() throws Exception {
 Tomcat tomcat = getTomcatInstance();
-tomcat.getConnector().setAttribute("restrictedUserAgents", 
"value-not-important");
+
Assert.assertTrue(tomcat.getConnector().setProperty("restrictedUserAgents", 
"value-not-important"));
 
 File appDir = new File("test/webapp");
 Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index ea156ba..e4a9b63 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -171,8 +171,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 
 // Minimise pauses during test
-tomcat.getConnector().setAttribute(
-"connectionTimeout", Integer.valueOf(3000));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"3000"));
 
 // No file system docBase required
 Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/catalina/core/TestStandardService.java 
b/test/org/apache/catalina/core/TestStandardService.java
index 0ec93ce..ba1e954 100644
--- a/test/org/apache/catalina/core/TestStandardService.java
+++ b/test/org/apache/catalina/core/TestStandardService.java
@@ -18,6 +18,7 @@ package org.apache.catalina.core;
 
 import java.net.InetAddress;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.connector.Connector;
@@ -49,7 +50,7 @@ public class TestStandardService extends TomcatBaseTest {
 Connector c2 = new Connector("HTTP/1.1");
 c2.setThrowOnFailure(throwOnFailure);
 
-c2.setAttribute("address", ((InetAddress) 
connector.getAttribute("address")).getHostAddress());
+Assert.assertTrue(c2.setProperty("address", ((InetAddress) 
connector.getProperty("address")).getHostAddress()));
 c2.setPort(connector.getLocalPort());
 
 tomcat.getService().addConnector(c2);
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java 
b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index 72e3a7b..83b1634 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -431,7 +431,7 @@ public class TestSwallowAbortedUploads extends 
TomcatBaseTest {
 // No need for target to exist.
 
 if (!limit) {
-tomcat.getConnector().setAttribute("maxSwallowSize", "-1");
+
Assert.assertTrue(tomcat.

[tomcat] 03/03: Deprecate pollerThreadCount

2020-01-15 Thread markt

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

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

commit c8c99bd2e57c4804b3bdb667d7b4e5f4ccb28640
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:44:54 2020 +

Deprecate pollerThreadCount
---
 java/org/apache/coyote/http11/Http11NioProtocol.java | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java 
b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 92c278c..43327f3 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -50,10 +50,21 @@ public class Http11NioProtocol extends 
AbstractHttp11JsseProtocol {
  * NO-OP.
  *
  * @param count Unused
+ *
+ * @deprecated This setter will be removed in Tomcat 10.
  */
+@Deprecated
 public void setPollerThreadCount(int count) {
 }
 
+/**
+ * Always returns 1.
+ *
+ * @return 1
+ *
+ * @deprecated This getter will be removed in Tomcat 10.
+ */
+@Deprecated
 public int getPollerThreadCount() {
 return 1;
 }


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

[tomcat] 02/03: pollerThreadCount does not exist for APR

2020-01-15 Thread markt

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

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

commit b9da6430b0f8e4bbcfc2ca98779b90f697a26933
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:42:44 2020 +

pollerThreadCount does not exist for APR
---
 test/org/apache/catalina/startup/TomcatBaseTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java 
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 75e588d..d3cdc2e 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -184,7 +184,6 @@ public abstract class TomcatBaseTest extends 
LoggingBaseTest {
 AprLifecycleListener listener = new AprLifecycleListener();
 listener.setSSLRandomSeed("/dev/urandom");
 server.addLifecycleListener(listener);
-Assert.assertTrue(connector.setProperty("pollerThreadCount", "1"));
 }
 
 File catalinaBase = getTemporaryDirectory();


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

[tomcat] 03/04: Deprecate pollerThreadCount

2020-01-15 Thread markt

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

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

commit f79c5e90aa57ee449a23515cdcb2f4536a3b2a2c
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:44:54 2020 +

Deprecate pollerThreadCount
---
 java/org/apache/coyote/http11/Http11NioProtocol.java | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java 
b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 92c278c..43327f3 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -50,10 +50,21 @@ public class Http11NioProtocol extends 
AbstractHttp11JsseProtocol {
  * NO-OP.
  *
  * @param count Unused
+ *
+ * @deprecated This setter will be removed in Tomcat 10.
  */
+@Deprecated
 public void setPollerThreadCount(int count) {
 }
 
+/**
+ * Always returns 1.
+ *
+ * @return 1
+ *
+ * @deprecated This getter will be removed in Tomcat 10.
+ */
+@Deprecated
 public int getPollerThreadCount() {
 return 1;
 }


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

[tomcat] 04/04: Remove deprecated code

2020-01-15 Thread markt

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

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

commit 7b5a78864362665ac3933db0b673467bca92c3cd
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:45:08 2020 +

Remove deprecated code
---
 .../apache/coyote/http11/Http11NioProtocol.java| 23 --
 1 file changed, 23 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java 
b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 43327f3..f77e45b 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -46,29 +46,6 @@ public class Http11NioProtocol extends 
AbstractHttp11JsseProtocol {
 
 //  Pool setup 
 
-/**
- * NO-OP.
- *
- * @param count Unused
- *
- * @deprecated This setter will be removed in Tomcat 10.
- */
-@Deprecated
-public void setPollerThreadCount(int count) {
-}
-
-/**
- * Always returns 1.
- *
- * @return 1
- *
- * @deprecated This getter will be removed in Tomcat 10.
- */
-@Deprecated
-public int getPollerThreadCount() {
-return 1;
-}
-
 public void setSelectorTimeout(long timeout) {
 ((NioEndpoint)getEndpoint()).setSelectorTimeout(timeout);
 }


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

[tomcat] 01/04: Use setProperty and test return value in preference to setAttribute

2020-01-15 Thread markt

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

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

commit 13b03a8fe99db5189c8fabb7d63a5b151db6fa60
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:40:52 2020 +

Use setProperty and test return value in preference to setAttribute
---
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../connector/TestCoyoteAdapterRequestFuzzing.java |  2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |  3 +-
 .../apache/catalina/core/TestStandardService.java  |  3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |  2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|  7 ++---
 .../apache/coyote/http11/TestHttp11Processor.java  | 34 +++---
 .../util/http/TestMimeHeadersIntegration.java  |  3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  2 +-
 .../tomcat/websocket/TestConnectionLimit.java  |  3 +-
 10 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 44f297d..026a763 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1014,7 +1014,7 @@ public class ApplicationContext implements ServletContext 
{
 Connector[] connectors = service.findConnectors();
 // Need at least one SSL enabled connector to use the SSL session ID.
 for (Connector connector : connectors) {
-if (Boolean.TRUE.equals(connector.getAttribute("SSLEnabled"))) {
+if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
 supportedSessionTrackingModes.add(SessionTrackingMode.SSL);
 break;
 }
diff --git 
a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java 
b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
index dc8ac5e..f2edf46 100644
--- a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
+++ b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
@@ -110,7 +110,7 @@ public class TestCoyoteAdapterRequestFuzzing extends 
TomcatBaseTest {
 @Test
 public void doTest() throws Exception {
 Tomcat tomcat = getTomcatInstance();
-tomcat.getConnector().setAttribute("restrictedUserAgents", 
"value-not-important");
+
Assert.assertTrue(tomcat.getConnector().setProperty("restrictedUserAgents", 
"value-not-important"));
 
 File appDir = new File("test/webapp");
 Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 347fbb3..cd90776 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -171,8 +171,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 
 // Minimise pauses during test
-tomcat.getConnector().setAttribute(
-"connectionTimeout", Integer.valueOf(3000));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"3000"));
 
 // No file system docBase required
 Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/catalina/core/TestStandardService.java 
b/test/org/apache/catalina/core/TestStandardService.java
index 0ec93ce..ba1e954 100644
--- a/test/org/apache/catalina/core/TestStandardService.java
+++ b/test/org/apache/catalina/core/TestStandardService.java
@@ -18,6 +18,7 @@ package org.apache.catalina.core;
 
 import java.net.InetAddress;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.connector.Connector;
@@ -49,7 +50,7 @@ public class TestStandardService extends TomcatBaseTest {
 Connector c2 = new Connector("HTTP/1.1");
 c2.setThrowOnFailure(throwOnFailure);
 
-c2.setAttribute("address", ((InetAddress) 
connector.getAttribute("address")).getHostAddress());
+Assert.assertTrue(c2.setProperty("address", ((InetAddress) 
connector.getProperty("address")).getHostAddress()));
 c2.setPort(connector.getLocalPort());
 
 tomcat.getService().addConnector(c2);
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java 
b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index a90d4a6..1d0c077 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -431,7 +431,7 @@ public class TestSwallowAbortedUploads extends 
TomcatBaseTest {
 // No need for target to exist.
 
 if (!limit) {
-tomcat.getConnector().setAttribute("maxSwallowSize", "-1");
+
Assert.assertTrue(tomcat

[tomcat] branch master updated (a30e868 -> 7b5a788)

2020-01-15 Thread 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 a30e868  Version update
 new 13b03a8  Use setProperty and test return value in preference to 
setAttribute
 new 5773385  pollerThreadCount does not exist for APR
 new f79c5e9  Deprecate pollerThreadCount
 new 7b5a788  Remove deprecated code

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:
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../apache/coyote/http11/Http11NioProtocol.java| 12 
 .../connector/TestCoyoteAdapterRequestFuzzing.java |  2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |  3 +-
 .../apache/catalina/core/TestStandardService.java  |  3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |  2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|  6 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 34 +++---
 .../util/http/TestMimeHeadersIntegration.java  |  3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  2 +-
 .../tomcat/websocket/TestConnectionLimit.java  |  3 +-
 11 files changed, 29 insertions(+), 43 deletions(-)


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

[tomcat] 02/04: pollerThreadCount does not exist for APR

2020-01-15 Thread markt

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

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

commit 5773385b952d0e32edd7ac8711550676de6b7b5c
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:42:44 2020 +

pollerThreadCount does not exist for APR
---
 test/org/apache/catalina/startup/TomcatBaseTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java 
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 1494b77..e1b75ad 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -184,7 +184,6 @@ public abstract class TomcatBaseTest extends 
LoggingBaseTest {
 AprLifecycleListener listener = new AprLifecycleListener();
 listener.setSSLRandomSeed("/dev/urandom");
 server.addLifecycleListener(listener);
-Assert.assertTrue(connector.setProperty("pollerThreadCount", "1"));
 }
 
 File catalinaBase = getTemporaryDirectory();


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

[GitHub] [tomcat] bitcod3r commented on a change in pull request #232: Fix handling of query parameters with no value, like `?foo`

2020-01-15 Thread GitBox

bitcod3r commented on a change in pull request #232: Fix handling of query 
parameters with no value, like `?foo`
URL: https://github.com/apache/tomcat/pull/232#discussion_r367052401
 
 

 ##
 File path: res/tomcat-maven/README.md
 ##
 @@ -39,7 +39,7 @@ mvn clean; mvn package
 ```
 docker build -t apache/tomcat-maven:1.0 -f ./Dockerfile .
 ```
-Docker build arguments include `namepsace` (default is `tomcat`) and `port` 
which should match the Tomcat port in `server.xml` (default is `8080`). Other 
ports that need to be exposed can be added in the `Dockerfile` as needed. 
Webapps should be added to the `webapps` folder where they will be auto 
deployed by the host if using the defaults. Otherwise, the `Dockerfile` command 
line can be edited like below to include the necesary resources and command 
line arguments to run a single or multiple hardcoded web applications.
+Docker build arguments include `namespace` (default is `tomcat`) and `port` 
which should match the Tomcat port in `server.xml` (default is `8080`). Other 
ports that need to be exposed can be added in the `Dockerfile` as needed. 
Webapps should be added to the `webapps` folder where they will be auto 
deployed by the host if using the defaults. Otherwise, the `Dockerfile` command 
line can be edited like below to include the necesary resources and command 
line arguments to run a single or multiple hardcoded web applications.
 
 Review comment:
   Thanks for the clarification. :)


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

Re: [tomcat] 01/02: Update tests to use SSLHostConfig for TLS configuration

2020-01-15 Thread Mark Thomas

On 15/01/2020 16:41, Rémy Maucherat wrote:
> On Wed, Jan 15, 2020 at 5:35 PM Mark Thomas  > wrote:

> While I was doing this I did wonder about deprecating/removing
> [get|set]Attribute on Connector (and any other element where we have
> both [get|set]Attribute() and [get|set]Property(). Thoughts? Something
> to add to the TODO list?
> 
> 
> Ok, I forgot the real use of that [get|set]Attribute() to be honest.

I've figured it out.

[get|set]Property() (sort of) expects that the property exists. If it
doesn't, setProperty() is a NO-OP and getProperty() returns null, 0 or
equivalent.

[get|set]Attribute allows arbitrary properties to be set on the
Endpoint. I think this was to support TLS implementations that needed
additional properties. But we have moved away from that.

I think we are still OK to deprecate this in 9.x and remove in 10.x but
I'll leave it a few days before doing anything in case.

Mark

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

[tomcat] 02/02: Align master, 9.0.x and 8.5.x - Simplify

2020-01-15 Thread markt

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

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

commit 10be4d11bec0ed2f725b249f2c6afb89ced5d301
Author: Mark Thomas 
AuthorDate: Wed Jan 15 17:06:31 2020 +

Align master, 9.0.x and 8.5.x - Simplify
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 8ad166f..0d81f6d 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -837,13 +837,12 @@ public class CoyoteAdapter implements Adapter {
 }
 }
 }
-res.setStatus(405);
 if (header != null) {
 res.addHeader("Allow", header);
 }
-res.setMessage("TRACE method is not allowed");
-request.getContext().logAccess(request, response, 0, true);
-return false;
+response.sendError(405, "TRACE method is not allowed");
+// Safe to skip the remainder of this method.
+return true;
 }
 
 doConnectorAuthenticationAuthorization(req, request);


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

[tomcat] branch master updated: Version update

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a30e868  Version update
a30e868 is described below

commit a30e86854bf10b22b8974c75fd87fa1cb3856639
Author: Mark Thomas 
AuthorDate: Wed Jan 15 17:28:20 2020 +

Version update
---
 java/org/apache/catalina/util/ServerInfo.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/util/ServerInfo.java 
b/java/org/apache/catalina/util/ServerInfo.java
index a70b5bf..c480b35 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -69,11 +69,11 @@ public class ServerInfo {
 ExceptionUtils.handleThrowable(t);
 }
 if (info == null || info.equals("Apache Tomcat/@VERSION@"))
-info = "Apache Tomcat/9.0.x-dev";
+info = "Apache Tomcat/10.0.x-dev";
 if (built == null || built.equals("@VERSION_BUILT@"))
 built = "unknown";
 if (number == null || number.equals("@VERSION_NUMBER@"))
-number = "9.0.x";
+number = "10.0.x";
 
 serverInfo = info;
 serverBuilt = built;


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

[tomcat] 01/02: Align master, 9.0.x and 8.5.x

2020-01-15 Thread markt

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

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

commit 17e063f8339d492c0c0ee9bc18c27b85620fe794
Author: Mark Thomas 
AuthorDate: Wed Jan 15 17:00:37 2020 +

Align master, 9.0.x and 8.5.x
---
 java/org/apache/catalina/connector/Connector.java  |  6 +-
 java/org/apache/catalina/connector/LocalStrings.properties |  3 ++-
 java/org/apache/catalina/connector/LocalStrings_fr.properties  |  2 ++
 java/org/apache/catalina/connector/LocalStrings_ja.properties  |  2 ++
 java/org/apache/catalina/connector/LocalStrings_ko.properties  |  2 ++
 .../apache/catalina/connector/LocalStrings_zh_CN.properties|  2 ++
 java/org/apache/catalina/core/AprLifecycleListener.java| 10 +++---
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index ee4c9e3..1767199 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -978,8 +978,12 @@ public class Connector extends LifecycleMBeanBase  {
 setParseBodyMethods(getParseBodyMethods());
 }
 
+if (protocolHandler.isAprRequired() && 
!AprLifecycleListener.isInstanceCreated()) {
+throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprListener",
+getProtocolHandlerClassName()));
+}
 if (protocolHandler.isAprRequired() && 
!AprLifecycleListener.isAprAvailable()) {
-throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoApr",
+throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprLibrary",
 getProtocolHandlerClassName()));
 }
 if (AprLifecycleListener.isAprAvailable() && 
AprLifecycleListener.getUseOpenSSL() &&
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties 
b/java/org/apache/catalina/connector/LocalStrings.properties
index cdb98ed..0804159 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -28,7 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT 
include an entity (
 coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
 coyoteConnector.protocolHandlerInitializationFailed=Protocol handler 
initialization failed
 coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler 
instantiation failed
-coyoteConnector.protocolHandlerNoApr=The configured protocol [{0}] requires 
the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] 
requires the AprLifecycleListener which is not available
+coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}] 
requires the APR/native library which is not available
 coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
 coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
 coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties 
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index d93b398..4726bac 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -28,6 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=La méthode "TRACE" NE 
PEUT PAS contenir
 coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de 
protocole a échoué
 coyoteConnector.protocolHandlerInitializationFailed=L'initialisation du 
gestionnaire de protocole a échoué
 coyoteConnector.protocolHandlerInstantiationFailed=L'instantiation du 
gestionnaire de protocole a échoué
+coyoteConnector.protocolHandlerNoAprLibrary=Le protocole configuré [{0}] 
requiert la librairie APR/native qui n''est pas disponible
+coyoteConnector.protocolHandlerNoAprListener=Le protocole configuré [{0}] 
requiert AprLifecycleListener qui n''est pas disponible
 coyoteConnector.protocolHandlerPauseFailed=La suspension du gestionnaire de 
protocole a échouée
 coyoteConnector.protocolHandlerResumeFailed=Le redémarrage du gestionnaire de 
protocole a échoué
 coyoteConnector.protocolHandlerStartFailed=Le démarrage du gestionnaire de 
protocole a échoué
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties 
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index 5188b63..a037e3f 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -28,6 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE メソッドのリクエストは
 coyoteConnector.protocolHandlerDestroyFailed=プロトコルハンドラの廃棄に失敗しました

[tomcat] branch 8.5.x updated (a6d1837 -> 10be4d1)

2020-01-15 Thread markt

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

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


from a6d1837  Align master, 9.0.x and 8.5.x
 new 17e063f  Align master, 9.0.x and 8.5.x
 new 10be4d1  Align master, 9.0.x and 8.5.x - Simplify

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/catalina/connector/Connector.java  |  6 +-
 java/org/apache/catalina/connector/CoyoteAdapter.java  |  7 +++
 java/org/apache/catalina/connector/LocalStrings.properties |  3 ++-
 java/org/apache/catalina/connector/LocalStrings_fr.properties  |  2 ++
 java/org/apache/catalina/connector/LocalStrings_ja.properties  |  2 ++
 java/org/apache/catalina/connector/LocalStrings_ko.properties  |  2 ++
 .../apache/catalina/connector/LocalStrings_zh_CN.properties|  2 ++
 java/org/apache/catalina/core/AprLifecycleListener.java| 10 +++---
 8 files changed, 25 insertions(+), 9 deletions(-)


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

Re: [tomcat] 01/02: Update tests to use SSLHostConfig for TLS configuration

2020-01-15 Thread Rémy Maucherat

On Wed, Jan 15, 2020 at 5:35 PM Mark Thomas  wrote:

> On 15/01/2020 16:01, Rémy Maucherat wrote:
> > On Wed, Jan 15, 2020 at 4:37 PM  > > wrote:
> >
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > markt pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> > commit c64ccf3fd2bd58949360ab05b2f20da610b2c999
> > Author: Mark Thomas mailto:ma...@apache.org>>
> > AuthorDate: Wed Jan 15 15:36:05 2020 +
> >
> > Update tests to use SSLHostConfig for TLS configuration
> >
> >
> > I was doing this removal as well at the same time, predictably it has a
> > large impact on embedded TLS (which was already quite nightmarish). Oh
> > well, it had to happen.
>
> Sorry if I caused you to waste time on this.
>

No problem, you did it better.


>
> While I was doing this I did wonder about deprecating/removing
> [get|set]Attribute on Connector (and any other element where we have
> both [get|set]Attribute() and [get|set]Property(). Thoughts? Something
> to add to the TODO list?
>

Ok, I forgot the real use of that [get|set]Attribute() to be honest.

>
> I'm currently working on ensuring master, 9.0.x and 8.5.x are as aligned
> as possible (with a view to keeping them that way). Hopefully that won't
> conflict.
>

Rémy

>
>
> >
> > Rémy
> >
> >
> > ---
> >  test/org/apache/tomcat/util/net/TestCustomSsl.java | 35
> > +---
> >  test/org/apache/tomcat/util/net/TesterSupport.java | 49
> > ++
> >  .../util/net/jsse/TesterBug50640SslImpl.java   |  1 -
> >  3 files changed, 40 insertions(+), 45 deletions(-)
> >
> > diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> > b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> > index 60dbf00..f036931 100644
> > --- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> > +++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> > @@ -32,6 +32,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
> >  import org.apache.coyote.ProtocolHandler;
> >  import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
> >  import org.apache.tomcat.util.buf.ByteChunk;
> > +import org.apache.tomcat.util.net
> > .SSLHostConfigCertificate.Type;
> >  import org.apache.tomcat.util.net
> > .jsse.TesterBug50640SslImpl;
> >  import org.apache.tomcat.websocket.server.WsContextListener;
> >
> > @@ -59,20 +60,22 @@ public class TestCustomSsl extends
> TomcatBaseTest {
> >  Assume.assumeFalse("This test is only for JSSE based SSL
> > connectors",
> >
> >  connector.getProtocolHandlerClassName().contains("Apr"));
> >
> > +SSLHostConfig sslHostConfig = new SSLHostConfig();
> > +SSLHostConfigCertificate certificate = new
> > SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);
> > +sslHostConfig.addCertificate(certificate);
> > +connector.addSslHostConfig(sslHostConfig);
> > +
> >  Assert.assertTrue(connector.setProperty(
> >  "sslImplementationName",
> > "org.apache.tomcat.util.net
> > .jsse.TesterBug50640SslImpl"));
> >
> >  // This setting will break ssl configuration unless the
> custom
> >  // implementation is used.
> > -Assert.assertTrue(connector.setProperty(
> > -TesterBug50640SslImpl.PROPERTY_NAME,
> > TesterBug50640SslImpl.PROPERTY_VALUE));
> > +
> > sslHostConfig.setProtocols(TesterBug50640SslImpl.PROPERTY_VALUE);
> >
> > -Assert.assertTrue(connector.setProperty("sslProtocol",
> "tls"));
> > +sslHostConfig.setSslProtocol("tls");
> >
> > -File keystoreFile =
> > -new File(TesterSupport.LOCALHOST_RSA_JKS);
> > -connector.setAttribute(
> > -"keystoreFile", keystoreFile.getAbsolutePath());
> > +File keystoreFile = new
> File(TesterSupport.LOCALHOST_RSA_JKS);
> > +
> >
>  certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
> >
> >  connector.setSecure(true);
> >  Assert.assertTrue(connector.setProperty("SSLEnabled",
> "true"));
> > @@ -109,23 +112,25 @@ public class TestCustomSsl extends
> > TomcatBaseTest {
> >  Tomcat tomcat = getTomcatInstance();
> >
> >  Assume.assumeTrue("SSL renegotiation has to be supported
> > for this test",
> > -
> > TesterSupport.isRenegotiationSupported(getTomcatInstance()));
> > +TesterSupport.isRenegotiationSupported(tomcat));
> >
> >  TesterSupport.configureClientCertContext(tomcat);
> >
> > +Connector connector = tomcat.getConnector();
> > +
> >  // Override the def

[tomcat] branch 8.5.x updated: Align master, 9.0.x and 8.5.x

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new a6d1837  Align master, 9.0.x and 8.5.x
a6d1837 is described below

commit a6d18378bf72e05339430b8c382b224a94366de0
Author: Mark Thomas 
AuthorDate: Wed Jan 15 16:38:48 2020 +

Align master, 9.0.x and 8.5.x
---
 java/org/apache/catalina/ant/AbstractCatalinaTask.java| 15 +++
 java/org/apache/catalina/ant/ValidatorTask.java   |  2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorTask.java | 10 +++---
 .../authenticator/jaspic/AuthConfigFactoryImpl.java   |  4 +---
 .../authenticator/jaspic/SimpleServerAuthConfig.java  |  5 +
 java/org/apache/catalina/connector/Connector.java |  8 ++--
 6 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 32e09f7..0d30fe2 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -16,10 +16,10 @@
  */
 package org.apache.catalina.ant;
 
-import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.Authenticator;
 import java.net.HttpURLConnection;
 import java.net.PasswordAuthentication;
@@ -210,17 +210,8 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 
 // Send the request data (if any)
 if (istream != null) {
-try (BufferedOutputStream ostream = new BufferedOutputStream(
-hconn.getOutputStream(), 1024);) {
-byte buffer[] = new byte[1024];
-while (true) {
-int n = istream.read(buffer);
-if (n < 0) {
-break;
-}
-ostream.write(buffer, 0, n);
-}
-ostream.flush();
+try (OutputStream ostream = hconn.getOutputStream()) {
+IOTools.flow(istream, ostream);
 } finally {
 try {
 istream.close();
diff --git a/java/org/apache/catalina/ant/ValidatorTask.java 
b/java/org/apache/catalina/ant/ValidatorTask.java
index 896b7c7..1ac95ac 100644
--- a/java/org/apache/catalina/ant/ValidatorTask.java
+++ b/java/org/apache/catalina/ant/ValidatorTask.java
@@ -91,7 +91,7 @@ public class ValidatorTask extends BaseRedirectorHelperTask {
 // SecurityManager assume that untrusted applications may be deployed.
 Digester digester = DigesterFactory.newDigester(
 true, true, null, Globals.IS_SECURITY_ENABLED);
-try (InputStream stream = new BufferedInputStream(new 
FileInputStream(file.getCanonicalFile()));) {
+try (InputStream stream = new BufferedInputStream(new 
FileInputStream(file.getCanonicalFile( {
 InputSource is = new 
InputSource(file.toURI().toURL().toExternalForm());
 is.setByteStream(stream);
 digester.parse(is);
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index 0b6381b..8d5d268 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -23,7 +23,6 @@ import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.net.UnknownHostException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -617,8 +616,7 @@ public class JMXAccessorTask extends 
BaseRedirectorHelperTask {
 CompositeDataSupport data = (CompositeDataSupport) result;
 CompositeType compositeType = data.getCompositeType();
 Set keys = compositeType.keySet();
-for (Iterator iter = keys.iterator(); iter.hasNext();) {
-String key = iter.next();
+for (String key : keys) {
 Object value = data.get(key);
 OpenType type = compositeType.getType(key);
 if (type instanceof SimpleType) {
@@ -629,10 +627,8 @@ public class JMXAccessorTask extends 
BaseRedirectorHelperTask {
 }
 } else if (result instanceof TabularDataSupport) {
 TabularDataSupport data = (TabularDataSupport) result;
-for (Iterator iter = data.keySet().iterator(); 
iter.hasNext();) {
-Object key = iter.next();
-for (Iterator iter1 = ((List) key).iterator(); 
iter1.hasNext();) {
-Object key1 = iter1.next();
+

[tomcat] branch 9.0.x updated: Align master, 9.0.x and 8.5.x

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 581b30f  Align master, 9.0.x and 8.5.x
581b30f is described below

commit 581b30f831a156f3155eb0d6a5545a83b23db3f4
Author: Mark Thomas 
AuthorDate: Wed Jan 15 16:38:16 2020 +

Align master, 9.0.x and 8.5.x
---
 java/org/apache/catalina/ant/ServerinfoTask.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/org/apache/catalina/ant/ServerinfoTask.java 
b/java/org/apache/catalina/ant/ServerinfoTask.java
index e6605e0..f8c2ced 100644
--- a/java/org/apache/catalina/ant/ServerinfoTask.java
+++ b/java/org/apache/catalina/ant/ServerinfoTask.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.ant;
 
 
@@ -44,5 +42,4 @@ public class ServerinfoTask extends AbstractCatalinaTask {
 execute("/serverinfo");
 
 }
-
 }


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

[tomcat] 01/02: Version updates spotted reviewing master/9.0.x/8.5.x diff

2020-01-15 Thread markt

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

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

commit fcfa634484dc212db000669d107942fa915ad34f
Author: Mark Thomas 
AuthorDate: Wed Jan 15 16:36:58 2020 +

Version updates spotted reviewing master/9.0.x/8.5.x diff
---
 java/org/apache/catalina/ant/jmx/package.html | 4 ++--
 java/org/apache/catalina/ant/package.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/package.html 
b/java/org/apache/catalina/ant/jmx/package.html
index 6a49fc4..2bfaa85 100644
--- a/java/org/apache/catalina/ant/jmx/package.html
+++ b/java/org/apache/catalina/ant/jmx/package.html
@@ -20,8 +20,8 @@
 Ant (version 1.6 or later) that can be used to interact with the
 Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
 and query for Mbeans inside a running instance of Tomcat.  For more 
information, see
-https://tomcat.apache.org/tomcat-9.0-doc/monitoring.html";>
-https://tomcat.apache.org/tomcat-9.0-doc/monitoring.html.
+https://tomcat.apache.org/tomcat-10.0-doc/monitoring.html";>
+https://tomcat.apache.org/tomcat-10.0-doc/monitoring.html.
 
 Each task element can open a new jmx connection or reference an
 existing one. The following attribute are exists in every tasks:
diff --git a/java/org/apache/catalina/ant/package.html 
b/java/org/apache/catalina/ant/package.html
index 5b816ad..ba06ae0 100644
--- a/java/org/apache/catalina/ant/package.html
+++ b/java/org/apache/catalina/ant/package.html
@@ -20,8 +20,8 @@
 Ant (version 1.6.x or later) that can be used to interact with the
 Manager application to deploy, undeploy, list, reload, start and stop web 
applications
 from a running instance of Tomcat.  For more information, see
-https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html";>
-https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html.
+https://tomcat.apache.org/tomcat-10.0-doc/manager-howto.html";>
+https://tomcat.apache.org/tomcat-10.0-doc/manager-howto.html.
 
 The attributes of each task element correspond
 exactly to the request parameters that are included with an HTTP request


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

[tomcat] 02/02: Align master, 9.0.x and 8.5.x

2020-01-15 Thread markt

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

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

commit cd5a2ed796271df34a946d3a79187820f9e80602
Author: Mark Thomas 
AuthorDate: Wed Jan 15 16:37:17 2020 +

Align master, 9.0.x and 8.5.x
---
 java/org/apache/catalina/ant/ServerinfoTask.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/org/apache/catalina/ant/ServerinfoTask.java 
b/java/org/apache/catalina/ant/ServerinfoTask.java
index e6605e0..f8c2ced 100644
--- a/java/org/apache/catalina/ant/ServerinfoTask.java
+++ b/java/org/apache/catalina/ant/ServerinfoTask.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.ant;
 
 
@@ -44,5 +42,4 @@ public class ServerinfoTask extends AbstractCatalinaTask {
 execute("/serverinfo");
 
 }
-
 }


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

[tomcat] branch master updated (973b0a3 -> cd5a2ed)

2020-01-15 Thread 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 973b0a3  Remove support for deprecated TLS configuration style
 new fcfa634  Version updates spotted reviewing master/9.0.x/8.5.x diff
 new cd5a2ed  Align master, 9.0.x and 8.5.x

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/catalina/ant/ServerinfoTask.java | 3 ---
 java/org/apache/catalina/ant/jmx/package.html| 4 ++--
 java/org/apache/catalina/ant/package.html| 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)


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

Re: [tomcat] 01/02: Update tests to use SSLHostConfig for TLS configuration

2020-01-15 Thread Mark Thomas

On 15/01/2020 16:01, Rémy Maucherat wrote:
> On Wed, Jan 15, 2020 at 4:37 PM  > wrote:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> commit c64ccf3fd2bd58949360ab05b2f20da610b2c999
> Author: Mark Thomas mailto:ma...@apache.org>>
> AuthorDate: Wed Jan 15 15:36:05 2020 +
> 
>     Update tests to use SSLHostConfig for TLS configuration
> 
> 
> I was doing this removal as well at the same time, predictably it has a
> large impact on embedded TLS (which was already quite nightmarish). Oh
> well, it had to happen.

Sorry if I caused you to waste time on this.

While I was doing this I did wonder about deprecating/removing
[get|set]Attribute on Connector (and any other element where we have
both [get|set]Attribute() and [get|set]Property(). Thoughts? Something
to add to the TODO list?

I'm currently working on ensuring master, 9.0.x and 8.5.x are as aligned
as possible (with a view to keeping them that way). Hopefully that won't
conflict.


> 
> Rémy
>  
> 
> ---
>  test/org/apache/tomcat/util/net/TestCustomSsl.java | 35
> +---
>  test/org/apache/tomcat/util/net/TesterSupport.java | 49
> ++
>  .../util/net/jsse/TesterBug50640SslImpl.java       |  1 -
>  3 files changed, 40 insertions(+), 45 deletions(-)
> 
> diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> index 60dbf00..f036931 100644
> --- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> +++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> @@ -32,6 +32,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
>  import org.apache.coyote.ProtocolHandler;
>  import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
>  import org.apache.tomcat.util.buf.ByteChunk;
> +import org.apache.tomcat.util.net
> .SSLHostConfigCertificate.Type;
>  import org.apache.tomcat.util.net
> .jsse.TesterBug50640SslImpl;
>  import org.apache.tomcat.websocket.server.WsContextListener;
> 
> @@ -59,20 +60,22 @@ public class TestCustomSsl extends TomcatBaseTest {
>          Assume.assumeFalse("This test is only for JSSE based SSL
> connectors",
>                
>  connector.getProtocolHandlerClassName().contains("Apr"));
> 
> +        SSLHostConfig sslHostConfig = new SSLHostConfig();
> +        SSLHostConfigCertificate certificate = new
> SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);
> +        sslHostConfig.addCertificate(certificate);
> +        connector.addSslHostConfig(sslHostConfig);
> +
>          Assert.assertTrue(connector.setProperty(
>                  "sslImplementationName",
> "org.apache.tomcat.util.net
> .jsse.TesterBug50640SslImpl"));
> 
>          // This setting will break ssl configuration unless the custom
>          // implementation is used.
> -        Assert.assertTrue(connector.setProperty(
> -                TesterBug50640SslImpl.PROPERTY_NAME,
> TesterBug50640SslImpl.PROPERTY_VALUE));
> +       
> sslHostConfig.setProtocols(TesterBug50640SslImpl.PROPERTY_VALUE);
> 
> -        Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
> +        sslHostConfig.setSslProtocol("tls");
> 
> -        File keystoreFile =
> -            new File(TesterSupport.LOCALHOST_RSA_JKS);
> -        connector.setAttribute(
> -                "keystoreFile", keystoreFile.getAbsolutePath());
> +        File keystoreFile = new File(TesterSupport.LOCALHOST_RSA_JKS);
> +       
> certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
> 
>          connector.setSecure(true);
>          Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
> @@ -109,23 +112,25 @@ public class TestCustomSsl extends
> TomcatBaseTest {
>          Tomcat tomcat = getTomcatInstance();
> 
>          Assume.assumeTrue("SSL renegotiation has to be supported
> for this test",
> -               
> TesterSupport.isRenegotiationSupported(getTomcatInstance()));
> +                TesterSupport.isRenegotiationSupported(tomcat));
> 
>          TesterSupport.configureClientCertContext(tomcat);
> 
> +        Connector connector = tomcat.getConnector();
> +
>          // Override the defaults
> -        ProtocolHandler handler =
> tomcat.getConnector().getProtocolHandler();
> +        ProtocolHandler handler = connector.getProtocolHandler();
>          if (handler instanceof AbstractHttp11JsseProtocol) {
> -            ((AbstractHttp11JsseProtocol)
> handler).setTruststoreFile(null);
>

[Bug 62971] Revert the fix for 49464 in tomcat 9

2020-01-15 Thread bugzilla

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

--- Comment #5 from fuminz...@crd.com ---
Also it appears to require struts(1) action/tiles to get it happen - a simple
jsp with c:import does not show the issue behavior.

-- 
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 62971] Revert the fix for 49464 in tomcat 9

2020-01-15 Thread bugzilla

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

--- Comment #4 from fuminz...@crd.com ---
I am able to have an isolated case to reproduce the "bug" behavior now.
Still need to clean up a bit more before I submit.  But a quick update:
previously in the scenario I couldn't reproduce the "bug", appears to be
because locally a newer version of taglib was in effect. Removing the
taglibs-standard-impl-1.2.5.jar and taglibs-standard-spec-1.2.5.jar, and let
the javax.servlet.jsp.jstl-1.2.3.jar and javax.servlet.jsp.jstl-api-1.2.1.jar
to take effect, would cause the behavior to appear.  - Well, I guess it could
be said as a javax.servlet.jsp.jstl-1.2.3.jar bug...
-A quick update anyway.

-- 
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: [tomcat] 01/02: Update tests to use SSLHostConfig for TLS configuration

2020-01-15 Thread Rémy Maucherat

On Wed, Jan 15, 2020 at 4:37 PM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
> commit c64ccf3fd2bd58949360ab05b2f20da610b2c999
> Author: Mark Thomas 
> AuthorDate: Wed Jan 15 15:36:05 2020 +
>
> Update tests to use SSLHostConfig for TLS configuration
>

I was doing this removal as well at the same time, predictably it has a
large impact on embedded TLS (which was already quite nightmarish). Oh
well, it had to happen.

Rémy


> ---
>  test/org/apache/tomcat/util/net/TestCustomSsl.java | 35 +---
>  test/org/apache/tomcat/util/net/TesterSupport.java | 49
> ++
>  .../util/net/jsse/TesterBug50640SslImpl.java   |  1 -
>  3 files changed, 40 insertions(+), 45 deletions(-)
>
> diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> index 60dbf00..f036931 100644
> --- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> +++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> @@ -32,6 +32,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
>  import org.apache.coyote.ProtocolHandler;
>  import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
>  import org.apache.tomcat.util.buf.ByteChunk;
> +import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
>  import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl;
>  import org.apache.tomcat.websocket.server.WsContextListener;
>
> @@ -59,20 +60,22 @@ public class TestCustomSsl extends TomcatBaseTest {
>  Assume.assumeFalse("This test is only for JSSE based SSL
> connectors",
>  connector.getProtocolHandlerClassName().contains("Apr"));
>
> +SSLHostConfig sslHostConfig = new SSLHostConfig();
> +SSLHostConfigCertificate certificate = new
> SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);
> +sslHostConfig.addCertificate(certificate);
> +connector.addSslHostConfig(sslHostConfig);
> +
>  Assert.assertTrue(connector.setProperty(
>  "sslImplementationName", "org.apache.tomcat.util.net
> .jsse.TesterBug50640SslImpl"));
>
>  // This setting will break ssl configuration unless the custom
>  // implementation is used.
> -Assert.assertTrue(connector.setProperty(
> -TesterBug50640SslImpl.PROPERTY_NAME,
> TesterBug50640SslImpl.PROPERTY_VALUE));
> +sslHostConfig.setProtocols(TesterBug50640SslImpl.PROPERTY_VALUE);
>
> -Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
> +sslHostConfig.setSslProtocol("tls");
>
> -File keystoreFile =
> -new File(TesterSupport.LOCALHOST_RSA_JKS);
> -connector.setAttribute(
> -"keystoreFile", keystoreFile.getAbsolutePath());
> +File keystoreFile = new File(TesterSupport.LOCALHOST_RSA_JKS);
> +
> certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
>
>  connector.setSecure(true);
>  Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
> @@ -109,23 +112,25 @@ public class TestCustomSsl extends TomcatBaseTest {
>  Tomcat tomcat = getTomcatInstance();
>
>  Assume.assumeTrue("SSL renegotiation has to be supported for this
> test",
> -
> TesterSupport.isRenegotiationSupported(getTomcatInstance()));
> +TesterSupport.isRenegotiationSupported(tomcat));
>
>  TesterSupport.configureClientCertContext(tomcat);
>
> +Connector connector = tomcat.getConnector();
> +
>  // Override the defaults
> -ProtocolHandler handler =
> tomcat.getConnector().getProtocolHandler();
> +ProtocolHandler handler = connector.getProtocolHandler();
>  if (handler instanceof AbstractHttp11JsseProtocol) {
> -((AbstractHttp11JsseProtocol)
> handler).setTruststoreFile(null);
> +connector.findSslHostConfigs()[0].setTruststoreFile(null);
>  } else {
>  // Unexpected
>  Assert.fail("Unexpected handler type");
>  }
>  if (trustType.equals(TrustType.ALL)) {
> -tomcat.getConnector().setAttribute("trustManagerClassName",
> +connector.findSslHostConfigs()[0].setTrustManagerClassName(
>  "org.apache.tomcat.util.net
> .TesterSupport$TrustAllCerts");
>  } else if (trustType.equals(TrustType.CA)) {
> -tomcat.getConnector().setAttribute("trustManagerClassName",
> +connector.findSslHostConfigs()[0].setTrustManagerClassName(
>  "org.apache.tomcat.util.net
> .TesterSupport$SequentialTrustManager");
>  }
>
> @@ -135,16 +140,14 @@ public class TestCustomSsl extends TomcatBaseTest {
>  TesterSupport.configureClientSsl();
>
>  // Unprotected resource
> -ByteChunk res =
> -getUrl("https://localhost:";

[tomcat] branch 8.5.x updated: Update tests to use SSLHostConfig for TLS configuration

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4e7fd2e  Update tests to use SSLHostConfig for TLS configuration
4e7fd2e is described below

commit 4e7fd2ef1bd582ba216b54034e123694a3a630be
Author: Mark Thomas 
AuthorDate: Wed Jan 15 15:36:05 2020 +

Update tests to use SSLHostConfig for TLS configuration
---
 test/org/apache/tomcat/util/net/TestCustomSsl.java | 35 ---
 test/org/apache/tomcat/util/net/TesterSupport.java | 51 ++
 .../util/net/jsse/TesterBug50640SslImpl.java   |  1 -
 3 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java 
b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index 0372ba5..c3dd280 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -32,6 +32,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.coyote.ProtocolHandler;
 import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
 import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl;
 import org.apache.tomcat.websocket.server.WsContextListener;
 
@@ -59,20 +60,22 @@ public class TestCustomSsl extends TomcatBaseTest {
 Assume.assumeFalse("This test is only for JSSE based SSL connectors",
 connector.getProtocolHandlerClassName().contains("Apr"));
 
+SSLHostConfig sslHostConfig = new SSLHostConfig();
+SSLHostConfigCertificate certificate = new 
SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);
+sslHostConfig.addCertificate(certificate);
+connector.addSslHostConfig(sslHostConfig);
+
 Assert.assertTrue(connector.setProperty(
 "sslImplementationName", 
"org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl"));
 
 // This setting will break ssl configuration unless the custom
 // implementation is used.
-Assert.assertTrue(connector.setProperty(
-TesterBug50640SslImpl.PROPERTY_NAME, 
TesterBug50640SslImpl.PROPERTY_VALUE));
+sslHostConfig.setProtocols(TesterBug50640SslImpl.PROPERTY_VALUE);
 
-Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
+sslHostConfig.setSslProtocol("tls");
 
-File keystoreFile =
-new File(TesterSupport.LOCALHOST_RSA_JKS);
-connector.setAttribute(
-"keystoreFile", keystoreFile.getAbsolutePath());
+File keystoreFile = new File(TesterSupport.LOCALHOST_RSA_JKS);
+certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
 
 connector.setSecure(true);
 Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
@@ -109,23 +112,25 @@ public class TestCustomSsl extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 
 Assume.assumeTrue("SSL renegotiation has to be supported for this 
test",
-TesterSupport.isRenegotiationSupported(getTomcatInstance()));
+TesterSupport.isRenegotiationSupported(tomcat));
 
 TesterSupport.configureClientCertContext(tomcat);
 
+Connector connector = tomcat.getConnector();
+
 // Override the defaults
-ProtocolHandler handler = tomcat.getConnector().getProtocolHandler();
+ProtocolHandler handler = connector.getProtocolHandler();
 if (handler instanceof AbstractHttp11JsseProtocol) {
-((AbstractHttp11JsseProtocol) handler).setTruststoreFile(null);
+connector.findSslHostConfigs()[0].setTruststoreFile(null);
 } else {
 // Unexpected
 Assert.fail("Unexpected handler type");
 }
 if (trustType.equals(TrustType.ALL)) {
-tomcat.getConnector().setAttribute("trustManagerClassName",
+connector.findSslHostConfigs()[0].setTrustManagerClassName(
 "org.apache.tomcat.util.net.TesterSupport$TrustAllCerts");
 } else if (trustType.equals(TrustType.CA)) {
-tomcat.getConnector().setAttribute("trustManagerClassName",
+connector.findSslHostConfigs()[0].setTrustManagerClassName(
 
"org.apache.tomcat.util.net.TesterSupport$SequentialTrustManager");
 }
 
@@ -135,16 +140,14 @@ public class TestCustomSsl extends TomcatBaseTest {
 TesterSupport.configureClientSsl();
 
 // Unprotected resource
-ByteChunk res =
-getUrl("https://localhost:"; + getPort() + "/unprotected");
+ByteChunk res = getUrl("https://localhost:"; + getPort() + 
"/unprotected");
 Assert.assertEquals("OK", res.toString());
 
 // Protected resource
 res

[tomcat] 02/02: Remove support for deprecated TLS configuration style

2020-01-15 Thread markt

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

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

commit 973b0a304532a1d5a63b36ff88842e933cc91b82
Author: Mark Thomas 
AuthorDate: Wed Jan 15 15:36:40 2020 +

Remove support for deprecated TLS configuration style
---
 .../storeconfig/ConnectorStoreAppender.java|   9 +-
 .../catalina/storeconfig/server-registry.xml   |  53 ---
 .../coyote/http11/AbstractHttp11Protocol.java  | 377 -
 .../apache/tomcat/util/net/AbstractEndpoint.java   |   2 +-
 .../tomcat/util/net/AbstractJsseEndpoint.java  |   2 +-
 java/org/apache/tomcat/util/net/SSLHostConfig.java | 126 ---
 .../coyote/http11/TestAbstractHttp11Protocol.java  |  28 --
 webapps/docs/config/http.xml   | 346 ---
 webapps/docs/ssl-howto.xml |  63 ++--
 9 files changed, 41 insertions(+), 965 deletions(-)

diff --git a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java 
b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
index cfb5d32..c48416a 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
@@ -38,8 +38,7 @@ import org.apache.tomcat.util.net.SocketProperties;
  * Store the Connector attributes. Connector has really special design. A
  * Connector is only a startup Wrapper for a ProtocolHandler. This meant that
  * ProtocolHandler get all there attributes from the Connector attribute map.
- * Strange is that some attributes change there name and the attribute
- * sslProtocol need a special handling
+ * Strange is that some attributes change their name.
  */
 public class ConnectorStoreAppender extends StoreAppender {
 
@@ -47,13 +46,7 @@ public class ConnectorStoreAppender extends StoreAppender {
 protected static final Set internalExecutorAttributes = new 
HashSet<>();
 static {
 replacements.put("timeout", "connectionUploadTimeout");
-replacements.put("clientauth", "clientAuth");
-replacements.put("keystore", "keystoreFile");
 replacements.put("randomfile", "randomFile");
-replacements.put("keypass", "keystorePass");
-replacements.put("keytype", "keystoreType");
-replacements.put("protocol", "sslProtocol");
-replacements.put("protocols", "sslProtocols");
 
 internalExecutorAttributes.add("maxThreads");
 internalExecutorAttributes.add("minSpareThreads");
diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml 
b/java/org/apache/catalina/storeconfig/server-registry.xml
index 124ad9d..2b8279a 100644
--- a/java/org/apache/catalina/storeconfig/server-registry.xml
+++ b/java/org/apache/catalina/storeconfig/server-registry.xml
@@ -102,49 +102,6 @@
 URIEncoding
 maxProcessor
 minProcessor
-
-SSLProtocol
-sslEnabledProtocols
-SSLCipherSuite
-ciphers
-SSLCertificateChainFile
-SSLCertificateFile
-keyAlias
-SSLCertificateKeyFile
-keyPass
-SSLPassword
-keystoreFile
-keystorePass
-keystoreProvider
-keystoreType
-SSLCACertificateFile
-SSLCACertificatePath
-crlFile
-SSLCARevocationFile
-SSLCARevocationPath
-SSLDisableCompression
-SSLDisableSessionTickets
-SSLDisableCompression
-SSLHonorCipherOrder
-useServerCipherSuitesOrder
-algorithm
-sslContext
-sessionCacheSize
-sessionTimeout
-sslProtocol
-trustManagerClassName
-truststoreAlgorithm
-truststoreFile
-truststorePass
-truststoreProvider
-truststoreType
-
-clientAuth
-SSLVerifyClient
-trustMaxCertLength
-SSLVerifyDepth
-useServerCipherSuitesOrder
-SSLHonorCipherOrder
  
  
 openSslContext
 openSslConfContext
-
-certificateChainFile
-certificateFile
-certificateKeyAlias
-certificateKeyFile
-certificateKeyPassword
-certificateKeystoreFile
-certificateKeystorePassword
-certificateKeystoreProvider
-certificateKeystoreType
  
   extends 
AbstractProtocol {
 }
 public void setDefaultSSLHostConfigName(String defaultSSLHostConfigName) {
 getEndpoint().setDefaultSSLHostConfigName(defaultSSLHostConfigName);
-if (defaultSSLHostConfig != null) {
-defaultSSLHostConfig.setHostName(defaultSSLHostConfigName);
-}
 }
 
 
@@ -570,380 +567,6 @@ public abstract class AbstractHttp11Protocol extends 
AbstractProtocol {
 }
 
 
-// --- HTTPS specific 
properties
-//  Handled via an

[tomcat] branch 9.0.x updated: Update tests to use SSLHostConfig for TLS configuration

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 787f938  Update tests to use SSLHostConfig for TLS configuration
787f938 is described below

commit 787f93872c8a081cb8632a5786436f51e886f863
Author: Mark Thomas 
AuthorDate: Wed Jan 15 15:36:05 2020 +

Update tests to use SSLHostConfig for TLS configuration
---
 test/org/apache/tomcat/util/net/TestCustomSsl.java | 35 +---
 test/org/apache/tomcat/util/net/TesterSupport.java | 49 ++
 .../util/net/jsse/TesterBug50640SslImpl.java   |  1 -
 3 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java 
b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index 60dbf00..f036931 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -32,6 +32,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.coyote.ProtocolHandler;
 import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
 import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl;
 import org.apache.tomcat.websocket.server.WsContextListener;
 
@@ -59,20 +60,22 @@ public class TestCustomSsl extends TomcatBaseTest {
 Assume.assumeFalse("This test is only for JSSE based SSL connectors",
 connector.getProtocolHandlerClassName().contains("Apr"));
 
+SSLHostConfig sslHostConfig = new SSLHostConfig();
+SSLHostConfigCertificate certificate = new 
SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);
+sslHostConfig.addCertificate(certificate);
+connector.addSslHostConfig(sslHostConfig);
+
 Assert.assertTrue(connector.setProperty(
 "sslImplementationName", 
"org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl"));
 
 // This setting will break ssl configuration unless the custom
 // implementation is used.
-Assert.assertTrue(connector.setProperty(
-TesterBug50640SslImpl.PROPERTY_NAME, 
TesterBug50640SslImpl.PROPERTY_VALUE));
+sslHostConfig.setProtocols(TesterBug50640SslImpl.PROPERTY_VALUE);
 
-Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
+sslHostConfig.setSslProtocol("tls");
 
-File keystoreFile =
-new File(TesterSupport.LOCALHOST_RSA_JKS);
-connector.setAttribute(
-"keystoreFile", keystoreFile.getAbsolutePath());
+File keystoreFile = new File(TesterSupport.LOCALHOST_RSA_JKS);
+certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
 
 connector.setSecure(true);
 Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
@@ -109,23 +112,25 @@ public class TestCustomSsl extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 
 Assume.assumeTrue("SSL renegotiation has to be supported for this 
test",
-TesterSupport.isRenegotiationSupported(getTomcatInstance()));
+TesterSupport.isRenegotiationSupported(tomcat));
 
 TesterSupport.configureClientCertContext(tomcat);
 
+Connector connector = tomcat.getConnector();
+
 // Override the defaults
-ProtocolHandler handler = tomcat.getConnector().getProtocolHandler();
+ProtocolHandler handler = connector.getProtocolHandler();
 if (handler instanceof AbstractHttp11JsseProtocol) {
-((AbstractHttp11JsseProtocol) handler).setTruststoreFile(null);
+connector.findSslHostConfigs()[0].setTruststoreFile(null);
 } else {
 // Unexpected
 Assert.fail("Unexpected handler type");
 }
 if (trustType.equals(TrustType.ALL)) {
-tomcat.getConnector().setAttribute("trustManagerClassName",
+connector.findSslHostConfigs()[0].setTrustManagerClassName(
 "org.apache.tomcat.util.net.TesterSupport$TrustAllCerts");
 } else if (trustType.equals(TrustType.CA)) {
-tomcat.getConnector().setAttribute("trustManagerClassName",
+connector.findSslHostConfigs()[0].setTrustManagerClassName(
 
"org.apache.tomcat.util.net.TesterSupport$SequentialTrustManager");
 }
 
@@ -135,16 +140,14 @@ public class TestCustomSsl extends TomcatBaseTest {
 TesterSupport.configureClientSsl();
 
 // Unprotected resource
-ByteChunk res =
-getUrl("https://localhost:"; + getPort() + "/unprotected");
+ByteChunk res = getUrl("https://localhost:"; + getPort() + 
"/unprotected");
 Assert.assertEquals("OK", res.toString());
 
 // Protected resource
 re

[tomcat] branch master updated (9b328a6 -> 973b0a3)

2020-01-15 Thread 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 9b328a6  Skip setting attribute that is neither supported nor required 
for APR
 new c64ccf3  Update tests to use SSLHostConfig for TLS configuration
 new 973b0a3  Remove support for deprecated TLS configuration style

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:
 .../storeconfig/ConnectorStoreAppender.java|   9 +-
 .../catalina/storeconfig/server-registry.xml   |  53 ---
 .../coyote/http11/AbstractHttp11Protocol.java  | 377 -
 .../apache/tomcat/util/net/AbstractEndpoint.java   |   2 +-
 .../tomcat/util/net/AbstractJsseEndpoint.java  |   2 +-
 java/org/apache/tomcat/util/net/SSLHostConfig.java | 126 ---
 .../coyote/http11/TestAbstractHttp11Protocol.java  |  28 --
 test/org/apache/tomcat/util/net/TestCustomSsl.java |  35 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  49 ++-
 .../util/net/jsse/TesterBug50640SslImpl.java   |   1 -
 webapps/docs/config/http.xml   | 346 ---
 webapps/docs/ssl-howto.xml |  63 ++--
 12 files changed, 81 insertions(+), 1010 deletions(-)
 delete mode 100644 
test/org/apache/coyote/http11/TestAbstractHttp11Protocol.java


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

[tomcat] 01/02: Update tests to use SSLHostConfig for TLS configuration

2020-01-15 Thread markt

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

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

commit c64ccf3fd2bd58949360ab05b2f20da610b2c999
Author: Mark Thomas 
AuthorDate: Wed Jan 15 15:36:05 2020 +

Update tests to use SSLHostConfig for TLS configuration
---
 test/org/apache/tomcat/util/net/TestCustomSsl.java | 35 +---
 test/org/apache/tomcat/util/net/TesterSupport.java | 49 ++
 .../util/net/jsse/TesterBug50640SslImpl.java   |  1 -
 3 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java 
b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index 60dbf00..f036931 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -32,6 +32,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.coyote.ProtocolHandler;
 import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
 import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl;
 import org.apache.tomcat.websocket.server.WsContextListener;
 
@@ -59,20 +60,22 @@ public class TestCustomSsl extends TomcatBaseTest {
 Assume.assumeFalse("This test is only for JSSE based SSL connectors",
 connector.getProtocolHandlerClassName().contains("Apr"));
 
+SSLHostConfig sslHostConfig = new SSLHostConfig();
+SSLHostConfigCertificate certificate = new 
SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);
+sslHostConfig.addCertificate(certificate);
+connector.addSslHostConfig(sslHostConfig);
+
 Assert.assertTrue(connector.setProperty(
 "sslImplementationName", 
"org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl"));
 
 // This setting will break ssl configuration unless the custom
 // implementation is used.
-Assert.assertTrue(connector.setProperty(
-TesterBug50640SslImpl.PROPERTY_NAME, 
TesterBug50640SslImpl.PROPERTY_VALUE));
+sslHostConfig.setProtocols(TesterBug50640SslImpl.PROPERTY_VALUE);
 
-Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
+sslHostConfig.setSslProtocol("tls");
 
-File keystoreFile =
-new File(TesterSupport.LOCALHOST_RSA_JKS);
-connector.setAttribute(
-"keystoreFile", keystoreFile.getAbsolutePath());
+File keystoreFile = new File(TesterSupport.LOCALHOST_RSA_JKS);
+certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
 
 connector.setSecure(true);
 Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
@@ -109,23 +112,25 @@ public class TestCustomSsl extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 
 Assume.assumeTrue("SSL renegotiation has to be supported for this 
test",
-TesterSupport.isRenegotiationSupported(getTomcatInstance()));
+TesterSupport.isRenegotiationSupported(tomcat));
 
 TesterSupport.configureClientCertContext(tomcat);
 
+Connector connector = tomcat.getConnector();
+
 // Override the defaults
-ProtocolHandler handler = tomcat.getConnector().getProtocolHandler();
+ProtocolHandler handler = connector.getProtocolHandler();
 if (handler instanceof AbstractHttp11JsseProtocol) {
-((AbstractHttp11JsseProtocol) handler).setTruststoreFile(null);
+connector.findSslHostConfigs()[0].setTruststoreFile(null);
 } else {
 // Unexpected
 Assert.fail("Unexpected handler type");
 }
 if (trustType.equals(TrustType.ALL)) {
-tomcat.getConnector().setAttribute("trustManagerClassName",
+connector.findSslHostConfigs()[0].setTrustManagerClassName(
 "org.apache.tomcat.util.net.TesterSupport$TrustAllCerts");
 } else if (trustType.equals(TrustType.CA)) {
-tomcat.getConnector().setAttribute("trustManagerClassName",
+connector.findSslHostConfigs()[0].setTrustManagerClassName(
 
"org.apache.tomcat.util.net.TesterSupport$SequentialTrustManager");
 }
 
@@ -135,16 +140,14 @@ public class TestCustomSsl extends TomcatBaseTest {
 TesterSupport.configureClientSsl();
 
 // Unprotected resource
-ByteChunk res =
-getUrl("https://localhost:"; + getPort() + "/unprotected");
+ByteChunk res = getUrl("https://localhost:"; + getPort() + 
"/unprotected");
 Assert.assertEquals("OK", res.toString());
 
 // Protected resource
 res.recycle();
 int rc = -1;
 try {
-rc = getUrl("https://localhost:"; + getPort() + "/protected", res,
-null, null);
+

Re: Tomcat 7.0.x end of life

2020-01-15 Thread Coty Sutherland

On Tue, Jan 14, 2020 at 3:56 PM Mark Thomas  wrote:

> Hi all,
>
> This has been mentioned several times as we have figured out our
> approach to Jakarta EE 9 and Tomcat 10. I'd like to formally propose
> that we announce end of life for Tomcat 7.0.x as 31 March 2021.
>
> Thoughts?
>

+1


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

Re: Tomcat 7.0.x end of life

2020-01-15 Thread Keiichi Fujino

2020年1月15日(水) 5:56 Mark Thomas :

> Hi all,
>
> This has been mentioned several times as we have figured out our
> approach to Jakarta EE 9 and Tomcat 10. I'd like to formally propose
> that we announce end of life for Tomcat 7.0.x as 31 March 2021.
>
> Thoughts?
>
>
+1


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

-- 
Keiichi.Fujino

[Bug 64073] CompressionConfig does not clear Content-Length header if already set

2020-01-15 Thread bugzilla

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

bclozel  changed:

   What|Removed |Added

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

--- Comment #3 from bclozel  ---
My apologies for the confusion, it's indeed an improper use of Tomcat's API on
our side. I've created
https://github.com/spring-projects/spring-framework/issues/24361 to track that
change.

-- 
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 64073] CompressionConfig does not clear Content-Length header if already set

2020-01-15 Thread bugzilla

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

--- Comment #2 from Andy Wilkinson  ---
In this particular case (Spring Framework's reactive web stack adapted to
Tomcat), it's being set via TomcatHeadersAdapter [1]. It works directly with
MimeHeaders. I suspect that's the cause of the problem as I see that the
interception of setting Content-Length is done by org.apache.coyote.Response.

[1]
https://github.com/spring-projects/spring-framework/blob/6c2cb8ecf5d1d755f09aff80489aa8b6e49d70b1/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java

-- 
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] 02/06: Remove debug code

2020-01-15 Thread markt

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

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

commit fab9ed224963cdd5da6b2bb9c7874a928882048c
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:44:52 2020 +

Remove debug code
---
 test/org/apache/catalina/connector/TestInputBuffer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index 6b85146..e4e88e6 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,6 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Echo", new Utf8Echo());
 root.addServletMappingDecoded("/test", "Echo");
 
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"30"));
 tomcat.start();
 
 for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {


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

[tomcat] 05/06: Correct property name

2020-01-15 Thread markt

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

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

commit 7b2c9ba82011ccefba1577bfdecc72bd1e186f34
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:47:12 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestMaxConnections.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java 
b/test/org/apache/catalina/connector/TestMaxConnections.java
index 4746ad6..e469d8c 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -79,7 +79,7 @@ public class TestMaxConnections extends TomcatBaseTest {
 root.addServletMappingDecoded("/test", "Simple");
 
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"1"));
 Assert.assertTrue(tomcat.getConnector().setProperty("maxThreads", 
"10"));
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"2"));
 
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 Assert.assertTrue(tomcat.getConnector().setProperty("maxConnections", 
Integer.toString(MAX_CONNECTIONS)));
 Assert.assertTrue(tomcat.getConnector().setProperty("acceptCount", 
"1"));


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

[tomcat] 06/06: Skip setting attribute that is neither supported nor required for APR

2020-01-15 Thread markt

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

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

commit ec2e21b4210b503c4050e6c1332d29b1dba50987
Author: Mark Thomas 
AuthorDate: Wed Jan 15 12:01:45 2020 +

Skip setting attribute that is neither supported nor required for APR
---
 test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java 
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index bc52514..00c81a8 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -325,7 +325,10 @@ public class TestSSLHostConfigCompat extends 
TomcatBaseTest {
 connector.setScheme("https");
 connector.setSecure(true);
 Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
-Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+if (!connector.getProtocolHandlerClassName().contains("Apr")) {
+// Skip this for APR. It is not supported.
+Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+}
 sslHostConfig.setProtocols("TLSv1.2");
 connector.addSslHostConfig(sslHostConfig);
 


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

[tomcat] 03/06: Correct property name

2020-01-15 Thread markt

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

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

commit 3b3b0b570878b9122d0285046bbdf4acb00e5720
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:45:04 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestInputBuffer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index e4e88e6..0bf4ac9 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -67,7 +67,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
 root.addServletMappingDecoded("/", "Bug60400Servlet");
 
-Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", 
"9000"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("socket.appReadBufSize", 
"9000"));
 tomcat.start();
 
 ByteChunk bc = new ByteChunk();


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

[tomcat] 01/06: Check that uses of Connector.setProperty() in tests complete correctly

2020-01-15 Thread markt

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

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

commit 83bebc8e05fd0d8f596c11bb16f3f95f40ea79e2
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:44:40 2020 +

Check that uses of Connector.setProperty() in tests complete correctly
---
 test/org/apache/catalina/connector/TestInputBuffer.java |  4 ++--
 test/org/apache/catalina/connector/TestKeepAliveCount.java  |  6 +++---
 test/org/apache/catalina/connector/TestMaxConnections.java  | 13 ++---
 .../org/apache/catalina/core/TestSwallowAbortedUploads.java |  4 ++--
 .../org/apache/catalina/nonblocking/TestNonBlockingAPI.java |  4 ++--
 test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java| 12 ++--
 test/org/apache/coyote/http11/TestHttp11InputBuffer.java|  6 +++---
 test/org/apache/coyote/http11/TestHttp11Processor.java  |  4 ++--
 .../coyote/http11/filters/TestChunkedInputFilter.java   |  8 
 .../apache/tomcat/util/http/TestMimeHeadersIntegration.java |  4 ++--
 test/org/apache/tomcat/util/net/TestClientCertTls13.java|  4 ++--
 test/org/apache/tomcat/util/net/TestCustomSsl.java  | 12 ++--
 .../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java |  4 ++--
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java|  2 +-
 test/org/apache/tomcat/util/net/TesterSupport.java  | 10 ++
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java |  3 ++-
 16 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index 79604f4..6b85146 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Echo", new Utf8Echo());
 root.addServletMappingDecoded("/test", "Echo");
 
-tomcat.getConnector().setProperty("soTimeout", "30");
+Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"30"));
 tomcat.start();
 
 for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {
@@ -68,7 +68,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
 root.addServletMappingDecoded("/", "Bug60400Servlet");
 
-tomcat.getConnector().setProperty("appReadBufSize", "9000");
+Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", 
"9000"));
 tomcat.start();
 
 ByteChunk bc = new ByteChunk();
diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java 
b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index 63ff738..ae22f0f 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -58,9 +58,9 @@ public class TestKeepAliveCount extends TomcatBaseTest {
 Context root = tomcat.addContext("", TEMP_DIR);
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
-tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
-tomcat.getConnector().setProperty("soTimeout", "2");
-tomcat.getConnector().setProperty("keepAliveTimeout", "5");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"5"));
+Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 init = true;
 }
 
diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java 
b/test/org/apache/catalina/connector/TestMaxConnections.java
index 16904da..4746ad6 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -77,13 +77,12 @@ public class TestMaxConnections extends TomcatBaseTest {
 root.setUnloadDelay(soTimeout);
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
-tomcat.getConnector().setProperty("maxKeepAliveRequests", "1");
-tomcat.getConnector().setProperty("maxThreads", "10");
-tomcat.getConnector().setProperty("soTimeout", "2");
-tomcat.getConnector().setProperty("keepAliveTimeout", "5");
-tomcat.getConnector().setProperty(
-"maxConnections", Integer.toString(MAX_CONNECTIONS));
-tomcat.getConnector().setProperty("acceptCount", "1");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"1"));
+Assert.assertTrue(tomcat.getConnector().setProperty(

[tomcat] branch 8.5.x updated (aa0881c -> ec2e21b)

2020-01-15 Thread markt

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

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


from aa0881c  Fix IDE warnings
 new 83bebc8  Check that uses of Connector.setProperty() in tests complete 
correctly
 new fab9ed2  Remove debug code
 new 3b3b0b5  Correct property name
 new c7316cb  Correct property name
 new 7b2c9ba  Correct property name
 new ec2e21b  Skip setting attribute that is neither supported nor required 
for APR

The 6 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:
 test/org/apache/catalina/connector/TestInputBuffer.java |  3 +--
 test/org/apache/catalina/connector/TestKeepAliveCount.java  |  6 +++---
 test/org/apache/catalina/connector/TestMaxConnections.java  | 13 ++---
 .../org/apache/catalina/core/TestSwallowAbortedUploads.java |  4 ++--
 .../org/apache/catalina/nonblocking/TestNonBlockingAPI.java |  4 ++--
 test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java| 12 ++--
 test/org/apache/coyote/http11/TestHttp11InputBuffer.java|  6 +++---
 test/org/apache/coyote/http11/TestHttp11Processor.java  |  4 ++--
 .../coyote/http11/filters/TestChunkedInputFilter.java   |  8 
 .../apache/tomcat/util/http/TestMimeHeadersIntegration.java |  4 ++--
 test/org/apache/tomcat/util/net/TestClientCertTls13.java|  4 ++--
 test/org/apache/tomcat/util/net/TestCustomSsl.java  | 12 ++--
 .../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java |  7 +--
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java|  2 +-
 test/org/apache/tomcat/util/net/TesterSupport.java  | 10 ++
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java |  3 ++-
 16 files changed, 53 insertions(+), 49 deletions(-)


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

[tomcat] 04/06: Correct property name

2020-01-15 Thread markt

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

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

commit c7316cb683c2becc07f6ac09ad3a72db8b9fa67f
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:45:52 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestKeepAliveCount.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java 
b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index ae22f0f..60e109e 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -59,7 +59,7 @@ public class TestKeepAliveCount extends TomcatBaseTest {
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
 
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"5"));
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"2"));
 
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 init = true;
 }


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

[tomcat] 01/06: Check that uses of Connector.setProperty() in tests complete correctly

2020-01-15 Thread markt

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

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

commit 1246b14b2d93e49c57ee35d875e03436d7daf28d
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:44:40 2020 +

Check that uses of Connector.setProperty() in tests complete correctly
---
 test/org/apache/catalina/connector/TestInputBuffer.java |  4 ++--
 test/org/apache/catalina/connector/TestKeepAliveCount.java  |  6 +++---
 test/org/apache/catalina/connector/TestMaxConnections.java  | 13 ++---
 .../org/apache/catalina/core/TestSwallowAbortedUploads.java |  4 ++--
 .../org/apache/catalina/nonblocking/TestNonBlockingAPI.java |  4 ++--
 test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java| 12 ++--
 test/org/apache/coyote/http11/TestHttp11InputBuffer.java|  6 +++---
 test/org/apache/coyote/http11/TestHttp11Processor.java  |  4 ++--
 .../coyote/http11/filters/TestChunkedInputFilter.java   |  8 
 .../coyote/http11/upgrade/TestUpgradeInternalHandler.java   |  2 +-
 .../apache/tomcat/util/http/TestMimeHeadersIntegration.java |  4 ++--
 test/org/apache/tomcat/util/net/TestClientCertTls13.java|  4 ++--
 test/org/apache/tomcat/util/net/TestCustomSsl.java  | 12 ++--
 .../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java |  4 ++--
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java|  2 +-
 test/org/apache/tomcat/util/net/TesterSupport.java  |  8 +---
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java |  3 ++-
 17 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index 79604f4..6b85146 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Echo", new Utf8Echo());
 root.addServletMappingDecoded("/test", "Echo");
 
-tomcat.getConnector().setProperty("soTimeout", "30");
+Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"30"));
 tomcat.start();
 
 for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {
@@ -68,7 +68,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
 root.addServletMappingDecoded("/", "Bug60400Servlet");
 
-tomcat.getConnector().setProperty("appReadBufSize", "9000");
+Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", 
"9000"));
 tomcat.start();
 
 ByteChunk bc = new ByteChunk();
diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java 
b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index 63ff738..ae22f0f 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -58,9 +58,9 @@ public class TestKeepAliveCount extends TomcatBaseTest {
 Context root = tomcat.addContext("", TEMP_DIR);
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
-tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
-tomcat.getConnector().setProperty("soTimeout", "2");
-tomcat.getConnector().setProperty("keepAliveTimeout", "5");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"5"));
+Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 init = true;
 }
 
diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java 
b/test/org/apache/catalina/connector/TestMaxConnections.java
index 8191173..f9820b8 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -74,13 +74,12 @@ public class TestMaxConnections extends TomcatBaseTest {
 root.setUnloadDelay(soTimeout);
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
-tomcat.getConnector().setProperty("maxKeepAliveRequests", "1");
-tomcat.getConnector().setProperty("maxThreads", "10");
-tomcat.getConnector().setProperty("soTimeout", "2");
-tomcat.getConnector().setProperty("keepAliveTimeout", "5");
-tomcat.getConnector().setProperty(
-"maxConnections", Integer.toString(MAX_CONNECTIONS));
-tomcat.getConnector().setProperty("acceptCount", "1");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"

[tomcat] 03/06: Correct property name

2020-01-15 Thread markt

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

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

commit 494d4300ce32b4792abd765cecc5c60d1a122c7d
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:45:04 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestInputBuffer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index e4e88e6..0bf4ac9 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -67,7 +67,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
 root.addServletMappingDecoded("/", "Bug60400Servlet");
 
-Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", 
"9000"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("socket.appReadBufSize", 
"9000"));
 tomcat.start();
 
 ByteChunk bc = new ByteChunk();


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

[tomcat] 04/06: Correct property name

2020-01-15 Thread markt

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

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

commit 5652e14cc4be6db7f604bea14335c5556309e994
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:45:52 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestKeepAliveCount.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java 
b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index ae22f0f..60e109e 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -59,7 +59,7 @@ public class TestKeepAliveCount extends TomcatBaseTest {
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
 
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"5"));
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"2"));
 
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 init = true;
 }


-
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 (5de844f -> 73b3db3)

2020-01-15 Thread 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 5de844f  Remove Tomcat 10 item
 new 1246b14  Check that uses of Connector.setProperty() in tests complete 
correctly
 new 34eabbb  Remove debug code
 new 494d430  Correct property name
 new 5652e14  Correct property name
 new 013bf09  Correct property name
 new 73b3db3  Skip setting attribute that is neither supported nor required 
for APR

The 6 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:
 test/org/apache/catalina/connector/TestInputBuffer.java |  3 +--
 test/org/apache/catalina/connector/TestKeepAliveCount.java  |  6 +++---
 test/org/apache/catalina/connector/TestMaxConnections.java  | 13 ++---
 .../org/apache/catalina/core/TestSwallowAbortedUploads.java |  4 ++--
 .../org/apache/catalina/nonblocking/TestNonBlockingAPI.java |  4 ++--
 test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java| 12 ++--
 test/org/apache/coyote/http11/TestHttp11InputBuffer.java|  6 +++---
 test/org/apache/coyote/http11/TestHttp11Processor.java  |  4 ++--
 .../coyote/http11/filters/TestChunkedInputFilter.java   |  8 
 .../coyote/http11/upgrade/TestUpgradeInternalHandler.java   |  2 +-
 .../apache/tomcat/util/http/TestMimeHeadersIntegration.java |  4 ++--
 test/org/apache/tomcat/util/net/TestClientCertTls13.java|  4 ++--
 test/org/apache/tomcat/util/net/TestCustomSsl.java  | 12 ++--
 .../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java |  7 +--
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java|  2 +-
 test/org/apache/tomcat/util/net/TesterSupport.java  |  8 +---
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java |  3 ++-
 17 files changed, 53 insertions(+), 49 deletions(-)


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

[tomcat] 02/06: Remove debug code

2020-01-15 Thread markt

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

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

commit 34eabbb3470bbc02cbee804d1eb4d5a181043d6d
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:44:52 2020 +

Remove debug code
---
 test/org/apache/catalina/connector/TestInputBuffer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index 6b85146..e4e88e6 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,6 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Echo", new Utf8Echo());
 root.addServletMappingDecoded("/test", "Echo");
 
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"30"));
 tomcat.start();
 
 for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {


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

[tomcat] 06/06: Skip setting attribute that is neither supported nor required for APR

2020-01-15 Thread markt

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

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

commit 73b3db362dc391669b18c88f5213937fbea1bfb1
Author: Mark Thomas 
AuthorDate: Wed Jan 15 12:01:45 2020 +

Skip setting attribute that is neither supported nor required for APR
---
 test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java 
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 90c160f..e098b54 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -323,7 +323,10 @@ public class TestSSLHostConfigCompat extends 
TomcatBaseTest {
 connector.setScheme("https");
 connector.setSecure(true);
 Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
-Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+if (!connector.getProtocolHandlerClassName().contains("Apr")) {
+// Skip this for APR. It is not supported.
+Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+}
 sslHostConfig.setProtocols("TLSv1.2");
 connector.addSslHostConfig(sslHostConfig);
 


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

[tomcat] 05/06: Correct property name

2020-01-15 Thread markt

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

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

commit 013bf092446565233eedcc9e9b021cf0ec349062
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:47:12 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestMaxConnections.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java 
b/test/org/apache/catalina/connector/TestMaxConnections.java
index f9820b8..52a587c 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -76,7 +76,7 @@ public class TestMaxConnections extends TomcatBaseTest {
 root.addServletMappingDecoded("/test", "Simple");
 
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"1"));
 Assert.assertTrue(tomcat.getConnector().setProperty("maxThreads", 
"10"));
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"2"));
 
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 Assert.assertTrue(tomcat.getConnector().setProperty("maxConnections", 
Integer.toString(MAX_CONNECTIONS)));
 Assert.assertTrue(tomcat.getConnector().setProperty("acceptCount", 
"1"));


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

[tomcat] 02/07: Check that uses of Connector.setProperty() in tests complete correctly

2020-01-15 Thread markt

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

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

commit 200d15ae5b1150b46ca1e1400fe9d2d0ba10d9d3
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:44:40 2020 +

Check that uses of Connector.setProperty() in tests complete correctly
---
 test/org/apache/catalina/connector/TestInputBuffer.java |  4 ++--
 test/org/apache/catalina/connector/TestKeepAliveCount.java  |  6 +++---
 test/org/apache/catalina/connector/TestMaxConnections.java  | 13 ++---
 .../org/apache/catalina/core/TestSwallowAbortedUploads.java |  4 ++--
 .../org/apache/catalina/nonblocking/TestNonBlockingAPI.java |  4 ++--
 test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java| 12 ++--
 test/org/apache/coyote/http11/TestHttp11InputBuffer.java|  6 +++---
 test/org/apache/coyote/http11/TestHttp11Processor.java  |  4 ++--
 .../coyote/http11/filters/TestChunkedInputFilter.java   |  8 
 .../coyote/http11/upgrade/TestUpgradeInternalHandler.java   |  2 +-
 .../apache/tomcat/util/http/TestMimeHeadersIntegration.java |  4 ++--
 test/org/apache/tomcat/util/net/TestClientCertTls13.java|  4 ++--
 test/org/apache/tomcat/util/net/TestCustomSsl.java  | 12 ++--
 .../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java |  4 ++--
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java|  2 +-
 test/org/apache/tomcat/util/net/TesterSupport.java  |  8 +---
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java |  3 ++-
 17 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index 1576bec..55822f3 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Echo", new Utf8Echo());
 root.addServletMappingDecoded("/test", "Echo");
 
-tomcat.getConnector().setProperty("soTimeout", "30");
+Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"30"));
 tomcat.start();
 
 for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {
@@ -68,7 +68,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
 root.addServletMappingDecoded("/", "Bug60400Servlet");
 
-tomcat.getConnector().setProperty("appReadBufSize", "9000");
+Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", 
"9000"));
 tomcat.start();
 
 ByteChunk bc = new ByteChunk();
diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java 
b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index 8e40986..130b360 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -58,9 +58,9 @@ public class TestKeepAliveCount extends TomcatBaseTest {
 Context root = tomcat.addContext("", TEMP_DIR);
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
-tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
-tomcat.getConnector().setProperty("soTimeout", "2");
-tomcat.getConnector().setProperty("keepAliveTimeout", "5");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"5"));
+Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 init = true;
 }
 
diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java 
b/test/org/apache/catalina/connector/TestMaxConnections.java
index 541ea05..ea55ea4 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -74,13 +74,12 @@ public class TestMaxConnections extends TomcatBaseTest {
 root.setUnloadDelay(soTimeout);
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
-tomcat.getConnector().setProperty("maxKeepAliveRequests", "1");
-tomcat.getConnector().setProperty("maxThreads", "10");
-tomcat.getConnector().setProperty("soTimeout", "2");
-tomcat.getConnector().setProperty("keepAliveTimeout", "5");
-tomcat.getConnector().setProperty(
-"maxConnections", Integer.toString(MAX_CONNECTIONS));
-tomcat.getConnector().setProperty("acceptCount", "1");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests",

[tomcat] 03/07: Remove debug code

2020-01-15 Thread markt

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

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

commit e6127effe4c4b7c819849bbcd35ee79586ad291c
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:44:52 2020 +

Remove debug code
---
 test/org/apache/catalina/connector/TestInputBuffer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index 55822f3..bb2d708 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,6 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Echo", new Utf8Echo());
 root.addServletMappingDecoded("/test", "Echo");
 
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"30"));
 tomcat.start();
 
 for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {


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

[tomcat] 06/07: Correct property name

2020-01-15 Thread markt

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

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

commit ba8730a83d5a8a10b6daee852c868cdda3f4fb22
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:47:12 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestMaxConnections.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java 
b/test/org/apache/catalina/connector/TestMaxConnections.java
index ea55ea4..833b9e9 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -76,7 +76,7 @@ public class TestMaxConnections extends TomcatBaseTest {
 root.addServletMappingDecoded("/test", "Simple");
 
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"1"));
 Assert.assertTrue(tomcat.getConnector().setProperty("maxThreads", 
"10"));
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"2"));
 
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 Assert.assertTrue(tomcat.getConnector().setProperty("maxConnections", 
Integer.toString(MAX_CONNECTIONS)));
 Assert.assertTrue(tomcat.getConnector().setProperty("acceptCount", 
"1"));


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

[tomcat] 07/07: Skip setting attribute that is neither supported nor required for APR

2020-01-15 Thread markt

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

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

commit 9b328a648cbcd1e2a982710465e347003e32c96b
Author: Mark Thomas 
AuthorDate: Wed Jan 15 12:01:45 2020 +

Skip setting attribute that is neither supported nor required for APR
---
 test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java 
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 90c160f..e098b54 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -323,7 +323,10 @@ public class TestSSLHostConfigCompat extends 
TomcatBaseTest {
 connector.setScheme("https");
 connector.setSecure(true);
 Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
-Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+if (!connector.getProtocolHandlerClassName().contains("Apr")) {
+// Skip this for APR. It is not supported.
+Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+}
 sslHostConfig.setProtocols("TLSv1.2");
 connector.addSslHostConfig(sslHostConfig);
 


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

[tomcat] 05/07: Correct property name

2020-01-15 Thread markt

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

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

commit 5e546d01ea946509f38d5cb68ed0b6283e1172fc
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:45:52 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestKeepAliveCount.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java 
b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index 130b360..c27c5c1 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -59,7 +59,7 @@ public class TestKeepAliveCount extends TomcatBaseTest {
 Tomcat.addServlet(root, "Simple", new SimpleServlet());
 root.addServletMappingDecoded("/test", "Simple");
 
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"5"));
-Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", 
"2"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"2"));
 
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", 
"5"));
 init = true;
 }


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

[tomcat] 01/07: Remove @SuppressWarnings that is now unnecessary

2020-01-15 Thread markt

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

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

commit fa1e9cee22e4314b55509fb04d369087793ab22d
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:24:14 2020 +

Remove @SuppressWarnings that is now unnecessary
---
 test/org/apache/coyote/TestCompressionConfig.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/coyote/TestCompressionConfig.java 
b/test/org/apache/coyote/TestCompressionConfig.java
index b266c7a..f5dc037 100644
--- a/test/org/apache/coyote/TestCompressionConfig.java
+++ b/test/org/apache/coyote/TestCompressionConfig.java
@@ -54,7 +54,6 @@ public class TestCompressionConfig {
 @Parameter(2)
 public Boolean compress;
 
-@SuppressWarnings("deprecation")
 @Test
 public void testUseCompression() throws Exception {
 


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

[tomcat] 04/07: Correct property name

2020-01-15 Thread markt

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

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

commit 4c91d860c654b0746eede25df822d30c0c5a5583
Author: Mark Thomas 
AuthorDate: Wed Jan 15 11:45:04 2020 +

Correct property name
---
 test/org/apache/catalina/connector/TestInputBuffer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java 
b/test/org/apache/catalina/connector/TestInputBuffer.java
index bb2d708..d345bc3 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -67,7 +67,7 @@ public class TestInputBuffer extends TomcatBaseTest {
 Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
 root.addServletMappingDecoded("/", "Bug60400Servlet");
 
-Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", 
"9000"));
+
Assert.assertTrue(tomcat.getConnector().setProperty("socket.appReadBufSize", 
"9000"));
 tomcat.start();
 
 ByteChunk bc = new ByteChunk();


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

[tomcat] branch master updated (4036762 -> 9b328a6)

2020-01-15 Thread 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 4036762  Remove deprecated method
 new fa1e9ce  Remove @SuppressWarnings that is now unnecessary
 new 200d15a  Check that uses of Connector.setProperty() in tests complete 
correctly
 new e6127ef  Remove debug code
 new 4c91d86  Correct property name
 new 5e546d0  Correct property name
 new ba8730a  Correct property name
 new 9b328a6  Skip setting attribute that is neither supported nor required 
for APR

The 7 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:
 test/org/apache/catalina/connector/TestInputBuffer.java |  3 +--
 test/org/apache/catalina/connector/TestKeepAliveCount.java  |  6 +++---
 test/org/apache/catalina/connector/TestMaxConnections.java  | 13 ++---
 .../org/apache/catalina/core/TestSwallowAbortedUploads.java |  4 ++--
 .../org/apache/catalina/nonblocking/TestNonBlockingAPI.java |  4 ++--
 test/org/apache/coyote/TestCompressionConfig.java   |  1 -
 test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java| 12 ++--
 test/org/apache/coyote/http11/TestHttp11InputBuffer.java|  6 +++---
 test/org/apache/coyote/http11/TestHttp11Processor.java  |  4 ++--
 .../coyote/http11/filters/TestChunkedInputFilter.java   |  8 
 .../coyote/http11/upgrade/TestUpgradeInternalHandler.java   |  2 +-
 .../apache/tomcat/util/http/TestMimeHeadersIntegration.java |  4 ++--
 test/org/apache/tomcat/util/net/TestClientCertTls13.java|  4 ++--
 test/org/apache/tomcat/util/net/TestCustomSsl.java  | 12 ++--
 .../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java |  7 +--
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java|  2 +-
 test/org/apache/tomcat/util/net/TesterSupport.java  |  8 +---
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java |  3 ++-
 18 files changed, 53 insertions(+), 50 deletions(-)


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

[tomcat] branch master updated: Remove deprecated method

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 9378f6d  Remove deprecated method
9378f6d is described below

commit 9378f6db9525c9ba7b8783d82c9a180b253882d9
Author: remm 
AuthorDate: Wed Jan 15 12:51:04 2020 +0100

Remove deprecated method
---
 .../apache/catalina/servlets/DefaultServlet.java| 21 -
 1 file changed, 21 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 2a69ab7..73a9f47 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1565,27 +1565,6 @@ public class DefaultServlet extends HttpServlet {
 /**
  * Decide which way to render. HTML or XML.
  *
- * @param contextPath The path
- * @param resourceThe resource
- * @param encodingThe encoding to use to process the readme (if any)
- *
- * @return the input stream with the rendered output
- *
- * @throws IOException an IO error occurred
- * @throws ServletException rendering error
- *
- * @deprecated Use {@link #render(HttpServletRequest, String, WebResource, 
String)} instead
- */
-@Deprecated
-protected InputStream render(String contextPath, WebResource resource, 
String encoding)
-throws IOException, ServletException {
-
-return render(null, contextPath, resource, encoding);
-}
-
-/**
- * Decide which way to render. HTML or XML.
- *
  * @param request The HttpServletRequest being served
  * @param contextPath The path
  * @param resourceThe resource


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

[tomcat] branch master updated: Remove deprecated method

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4036762  Remove deprecated method
4036762 is described below

commit 4036762dd6b8b7c314d30f7d6c448b12e4e05d38
Author: remm 
AuthorDate: Wed Jan 15 12:51:12 2020 +0100

Remove deprecated method
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 14 --
 1 file changed, 14 deletions(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 0c2eb6e..2d17a72 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -223,20 +223,6 @@ public final class IntrospectionUtils {
  * @param value The value
  * @param staticProp Replacement properties
  * @param dynamicProp Replacement properties
- * @return the replacement value
- * @deprecated Use {@link #replaceProperties(String, Hashtable, 
PropertySource[], ClassLoader)}
- */
-@Deprecated
-public static String replaceProperties(String value,
-Hashtable staticProp, PropertySource dynamicProp[]) 
{
-return replaceProperties(value, staticProp, dynamicProp, null);
-}
-
-/**
- * Replace ${NAME} with the property value.
- * @param value The value
- * @param staticProp Replacement properties
- * @param dynamicProp Replacement properties
  * @param classLoader Class loader associated with the code requesting the
  *property
  * @return the replacement value


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

[tomcat] branch master updated: Remove deprecated main method

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 7262215  Remove deprecated main method
7262215 is described below

commit 72622151e442cfe719c422d2bf868a204388f98b
Author: remm 
AuthorDate: Wed Jan 15 12:50:10 2020 +0100

Remove deprecated main method
---
 .../catalina/ha/deploy/FileMessageFactory.java | 32 --
 1 file changed, 32 deletions(-)

diff --git a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java 
b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
index 88b34f0..218ef0e 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
@@ -342,38 +342,6 @@ public class FileMessageFactory {
 }
 }
 
-/**
- * Example usage.
- *
- * @param args
- *String[], args[0] - read from filename, args[1] write to
- *filename
- * @throws Exception An error occurred
- * @deprecated
- */
-@Deprecated
-public static void main(String[] args) throws Exception {
-System.out.println("Usage: FileMessageFactory fileToBeRead 
fileToBeWritten");
-System.out.println("Usage: This will make a copy of the file on the 
local file system");
-FileMessageFactory read = getInstance(new File(args[0]), false);
-FileMessageFactory write = getInstance(new File(args[1]), true);
-FileMessage msg = new FileMessage(null, args[0], args[0]);
-msg = read.readMessage(msg);
-if (msg == null) {
-System.out.println("Empty input file : " + args[0]);
-return;
-}
-System.out.println("Expecting to write " + msg.getTotalNrOfMsgs()
-+ " messages.");
-int cnt = 0;
-while (msg != null) {
-write.writeMessage(msg);
-cnt++;
-msg = read.readMessage(msg);
-}//while
-System.out.println("Actually wrote " + cnt + " messages.");
-}///main
-
 public File getFile() {
 return file;
 }


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

[tomcat] branch master updated: Remove deprecated Vary class

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new ab9ce1d  Remove deprecated Vary class
ab9ce1d is described below

commit ab9ce1d5f70242b0ae1f19b1ad3625cc22313306
Author: remm 
AuthorDate: Wed Jan 15 12:50:36 2020 +0100

Remove deprecated Vary class
---
 java/org/apache/tomcat/util/http/parser/Vary.java  | 37 --
 .../tomcat/util/http/parser/TestTokenList.java |  7 
 2 files changed, 44 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/Vary.java 
b/java/org/apache/tomcat/util/http/parser/Vary.java
deleted file mode 100644
index e064620..000
--- a/java/org/apache/tomcat/util/http/parser/Vary.java
+++ /dev/null
@@ -1,37 +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.tomcat.util.http.parser;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Set;
-
-/**
- * @deprecated  Use {@link TokenList}.
- */
-@Deprecated
-public class Vary {
-
-private Vary() {
-// Utility class. Hide default constructor.
-}
-
-
-public static void parseVary(StringReader input, Set result) 
throws IOException {
-TokenList.parseTokenList(input, result);
-}
-}
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java 
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
index 8405bda..642c9a7 100644
--- a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
+++ b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
@@ -125,16 +125,9 @@ public class TestTokenList {
 }
 
 
-@SuppressWarnings("deprecation")
 private void doTestVary(String input, Set expected) throws 
IOException {
 StringReader reader = new StringReader(input);
 Set result = new HashSet<>();
-Vary.parseVary(reader, result);
-Assert.assertEquals(expected, result);
-
-// Can't use reset(). Parser uses marks.
-reader = new StringReader(input);
-result.clear();
 TokenList.parseTokenList(reader, result);
 Assert.assertEquals(expected, result);
 }


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

[tomcat] branch master updated: Remove unused deprecated field

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 6032a54  Remove unused deprecated field
6032a54 is described below

commit 6032a54ef573733e1d779f5db14882832054dceb
Author: remm 
AuthorDate: Wed Jan 15 12:49:51 2020 +0100

Remove unused deprecated field
---
 java/org/apache/catalina/util/LifecycleMBeanBase.java | 5 -
 1 file changed, 5 deletions(-)

diff --git a/java/org/apache/catalina/util/LifecycleMBeanBase.java 
b/java/org/apache/catalina/util/LifecycleMBeanBase.java
index d20147e..186371a 100644
--- a/java/org/apache/catalina/util/LifecycleMBeanBase.java
+++ b/java/org/apache/catalina/util/LifecycleMBeanBase.java
@@ -41,8 +41,6 @@ public abstract class LifecycleMBeanBase extends LifecycleBase
 /* Cache components of the MBean registration. */
 private String domain = null;
 private ObjectName oname = null;
-@Deprecated
-protected MBeanServer mserver = null;
 
 /**
  * Sub-classes wishing to perform additional initialization should override
@@ -54,8 +52,6 @@ public abstract class LifecycleMBeanBase extends LifecycleBase
 // If oname is not null then registration has already happened via
 // preRegister().
 if (oname == null) {
-mserver = Registry.getRegistry(null, null).getMBeanServer();
-
 oname = register(this, getObjectNameKeyProperties());
 }
 }
@@ -237,7 +233,6 @@ public abstract class LifecycleMBeanBase extends 
LifecycleBase
 public final ObjectName preRegister(MBeanServer server, ObjectName name)
 throws Exception {
 
-this.mserver = server;
 this.oname = name;
 this.domain = name.getDomain().intern();
 


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

[tomcat] branch master updated: Remove unused deprecated code

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8c4b36d  Remove unused deprecated code
8c4b36d is described below

commit 8c4b36dfb754822dfbd61468eeb55adc044ccb9b
Author: remm 
AuthorDate: Wed Jan 15 12:49:20 2020 +0100

Remove unused deprecated code
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  | 38 --
 .../apache/tomcat/util/net/SocketWrapperBase.java  | 30 -
 2 files changed, 68 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 33037fb..35c9df8 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1333,44 +1333,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint {
 }
 
 /**
- * If an asynchronous read operation is pending, this method will block
- * until the operation completes, or the specified amount of time
- * has passed.
- * @param timeout The maximum amount of time to wait
- * @param unit The unit for the timeout
- * @return true if the read operation is complete,
- *  false if the operation is still pending and
- *  the specified timeout has passed
- */
-@Deprecated
-public boolean awaitReadComplete(long timeout, TimeUnit unit) {
-return true;
-}
-
-/**
- * If an asynchronous write operation is pending, this method will block
- * until the operation completes, or the specified amount of time
- * has passed.
- * @param timeout The maximum amount of time to wait
- * @param unit The unit for the timeout
- * @return true if the read operation is complete,
- *  false if the operation is still pending and
- *  the specified timeout has passed
- */
-@Deprecated
-public boolean awaitWriteComplete(long timeout, TimeUnit unit) {
-return true;
-}
-
-/**
  * Scatter read. The completion handler will be called once some
  * data has been read or an error occurred. The default NIO2
  * behavior is used: the completion handler will be called as soon


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

[tomcat] branch master updated: Delete some deprecated code planned for removal in Tomcat 10

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 51a2e60  Delete some deprecated code planned for removal in Tomcat 10
51a2e60 is described below

commit 51a2e6013ed9f9ce4366cfefb4246e57dd9c6797
Author: remm 
AuthorDate: Wed Jan 15 11:14:19 2020 +0100

Delete some deprecated code planned for removal in Tomcat 10

noCompressionStrongETag is now set to true.
---
 java/org/apache/coyote/CompressionConfig.java  | 42 +++---
 .../coyote/http11/AbstractHttp11Protocol.java  | 10 --
 java/org/apache/coyote/http2/Http2Protocol.java| 10 --
 test/org/apache/coyote/TestCompressionConfig.java  | 27 ++
 4 files changed, 15 insertions(+), 74 deletions(-)

diff --git a/java/org/apache/coyote/CompressionConfig.java 
b/java/org/apache/coyote/CompressionConfig.java
index 5d26c88..b2b2e2a 100644
--- a/java/org/apache/coyote/CompressionConfig.java
+++ b/java/org/apache/coyote/CompressionConfig.java
@@ -46,7 +46,6 @@ public class CompressionConfig {
 
"text/javascript,application/javascript,application/json,application/xml";
 private String[] compressibleMimeTypes = null;
 private int compressionMinSize = 2048;
-private boolean noCompressionStrongETag = true;
 
 
 /**
@@ -184,35 +183,6 @@ public class CompressionConfig {
 
 
 /**
- * Determine if compression is disabled if the resource has a strong ETag.
- *
- * @return {@code true} if compression is disabled, otherwise {@code false}
- *
- * @deprecated Will be removed in Tomcat 10 where it will be hard-coded to
- * {@code true}
- */
-@Deprecated
-public boolean getNoCompressionStrongETag() {
-return noCompressionStrongETag;
-}
-
-
-/**
- * Set whether compression is disabled for resources with a strong ETag.
- *
- * @param noCompressionStrongETag {@code true} if compression is disabled,
- *otherwise {@code false}
- *
- * @deprecated Will be removed in Tomcat 10 where it will be hard-coded to
- * {@code true}
- */
-@Deprecated
-public void setNoCompressionStrongETag(boolean noCompressionStrongETag) {
-this.noCompressionStrongETag = noCompressionStrongETag;
-}
-
-
-/**
  * Determines if compression should be enabled for the given response and 
if
  * it is, sets any necessary headers to mark it as such.
  *
@@ -266,13 +236,11 @@ public class CompressionConfig {
 }
 
 // Check if the resource has a strong ETag
-if (noCompressionStrongETag) {
-String eTag = responseHeaders.getHeader("ETag");
-if (eTag != null && !eTag.trim().startsWith("W/")) {
-// Has an ETag that doesn't start with "W/..." so it must be a
-// strong ETag
-return false;
-}
+String eTag = responseHeaders.getHeader("ETag");
+if (eTag != null && !eTag.trim().startsWith("W/")) {
+// Has an ETag that doesn't start with "W/..." so it must be a
+// strong ETag
+return false;
 }
 
 // If processing reaches this far, the response might be compressed.
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index 3f02a12..c40e1b3 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -279,16 +279,6 @@ public abstract class AbstractHttp11Protocol extends 
AbstractProtocol {
 }
 
 
-@Deprecated
-public boolean getNoCompressionStrongETag() {
-return compressionConfig.getNoCompressionStrongETag();
-}
-@Deprecated
-public void setNoCompressionStrongETag(boolean noCompressionStrongETag) {
-compressionConfig.setNoCompressionStrongETag(noCompressionStrongETag);
-}
-
-
 public boolean useCompression(Request request, Response response) {
 return compressionConfig.useCompression(request, response);
 }
diff --git a/java/org/apache/coyote/http2/Http2Protocol.java 
b/java/org/apache/coyote/http2/Http2Protocol.java
index ed23505..aab980c 100644
--- a/java/org/apache/coyote/http2/Http2Protocol.java
+++ b/java/org/apache/coyote/http2/Http2Protocol.java
@@ -408,16 +408,6 @@ public class Http2Protocol implements UpgradeProtocol {
 }
 
 
-@Deprecated
-public boolean getNoCompressionStrongETag() {
-return compressionConfig.getNoCompressionStrongETag();
-}
-@Deprecated
-public void setNoCompressionStrongETag(boolean noCompressionStrongETag) {
-compressionConfig.setNoCompressionStrongETag(noCompressionStrongETag);
-}
-
-
 public boolean useCompression(Re

[tomcat] branch master updated: Delete some deprecated code planned for removal in Tomcat 10

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a50060f  Delete some deprecated code planned for removal in Tomcat 10
a50060f is described below

commit a50060fb773e8d3b9ce63c1e17fe91d4f131bbf5
Author: remm 
AuthorDate: Wed Jan 15 11:04:36 2020 +0100

Delete some deprecated code planned for removal in Tomcat 10

No warning when using the default configuration source, the
implementation looks decent enough for embedded and is what users
usually expect. It is also a bit annoying to i18n and log too early.
---
 java/org/apache/coyote/AbstractProtocol.java   | 23 -
 .../apache/tomcat/util/file/ConfigFileLoader.java  | 39 ++
 2 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index 7a04834..92ff009 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -312,29 +312,6 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 return endpoint.getConnectionCount();
 }
 
-/**
- * NO-OP.
- *
- * @param threadCount Unused
- *
- * @deprecated Will be removed in Tomcat 10.
- */
-@Deprecated
-public void setAcceptorThreadCount(int threadCount) {
-}
-
-/**
- * Always returns 1.
- *
- * @return Always 1.
- *
- * @deprecated Will be removed in Tomcat 10.
- */
-@Deprecated
-public int getAcceptorThreadCount() {
-  return 1;
-}
-
 public void setAcceptorThreadPriority(int threadPriority) {
 endpoint.setAcceptorThreadPriority(threadPriority);
 }
diff --git a/java/org/apache/tomcat/util/file/ConfigFileLoader.java 
b/java/org/apache/tomcat/util/file/ConfigFileLoader.java
index ce0f5ee..e6f4f21 100644
--- a/java/org/apache/tomcat/util/file/ConfigFileLoader.java
+++ b/java/org/apache/tomcat/util/file/ConfigFileLoader.java
@@ -17,9 +17,7 @@
  */
 package org.apache.tomcat.util.file;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 
 /**
  * This class is used to obtain {@link InputStream}s for configuration files
@@ -30,14 +28,23 @@ public class ConfigFileLoader {
 
 private static ConfigurationSource source;
 
+/**
+ * Get the configured configuration source. If none has been configured,
+ * a default source based on the calling directory will be used.
+ * @return the configuration source in use
+ */
 public static final ConfigurationSource getSource() {
 if (ConfigFileLoader.source == null) {
-// TODO: Add logging in Tomcat 10 when the default is silently 
used, or remove the default
 return ConfigurationSource.DEFAULT;
 }
 return source;
 }
 
+/**
+ * Set the configuration source used by Tomcat to locate various
+ * configuration resources.
+ * @param source The source
+ */
 public static final void setSource(ConfigurationSource source) {
 if (ConfigFileLoader.source == null) {
 ConfigFileLoader.source = source;
@@ -45,32 +52,8 @@ public class ConfigFileLoader {
 }
 
 private ConfigFileLoader() {
-// Utility class. Hide the default constructor.
+// Hide the constructor
 }
 
 
-/**
- * Load the resource from the specified location.
- *
- * @param location The location for the resource of interest. The location
- * may be a URL or a file path. Relative paths will be
- * resolved against CATALINA_BASE.
- *
- * @return The InputStream for the given resource. The caller is 
responsible
- * for closing this stream when it is no longer used.
- *
- * @throws IOException If an InputStream cannot be created using the
- * provided location
- */
-@Deprecated
-public static InputStream getInputStream(String location) throws 
IOException {
-return getSource().getResource(location).getInputStream();
-}
-
-
-@Deprecated
-public static URI getURI(String location) {
-return getSource().getURI(location);
-}
-
 }


-
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: Remove Tomcat 10 item

2020-01-15 Thread remm

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 5de844f  Remove Tomcat 10 item
5de844f is described below

commit 5de844f18710e4ed55b887c3b6b5e56e0b917190
Author: remm 
AuthorDate: Wed Jan 15 11:06:25 2020 +0100

Remove Tomcat 10 item

No warning when using the default configuration source, the
implementation looks decent enough for embedded and is what users
usually expect. It is also a bit annoying to i18n and log too early.
---
 java/org/apache/tomcat/util/file/ConfigFileLoader.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/file/ConfigFileLoader.java 
b/java/org/apache/tomcat/util/file/ConfigFileLoader.java
index ce0f5ee..5ce18bd 100644
--- a/java/org/apache/tomcat/util/file/ConfigFileLoader.java
+++ b/java/org/apache/tomcat/util/file/ConfigFileLoader.java
@@ -32,7 +32,6 @@ public class ConfigFileLoader {
 
 public static final ConfigurationSource getSource() {
 if (ConfigFileLoader.source == null) {
-// TODO: Add logging in Tomcat 10 when the default is silently 
used, or remove the default
 return ConfigurationSource.DEFAULT;
 }
 return source;


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

[tomcat] branch master updated: Remove implementation of removed, deprecated method

2020-01-15 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fa1f7ae  Remove implementation of removed, deprecated method
fa1f7ae is described below

commit fa1f7aea44b46f978168ba93677345f47b06a0b3
Author: Mark Thomas 
AuthorDate: Wed Jan 15 09:37:09 2020 +

Remove implementation of removed, deprecated method
---
 java/org/apache/coyote/AbstractProtocol.java | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index 2f5f49a..7a04834 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -19,7 +19,6 @@ package org.apache.coyote;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
@@ -1046,20 +1045,6 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 }
 
 
-@Override
-public Set getOpenSockets() {
-Set> set = 
proto.getEndpoint().getConnections();
-Set result = new HashSet<>();
-for (SocketWrapperBase socketWrapper : set) {
-S socket = socketWrapper.getSocket();
-if (socket != null) {
-result.add(socket);
-}
-}
-return result;
-}
-
-
 /**
  * Expected to be used by the handler once the processor is no longer
  * required.


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

[tomcat] branch master updated (46fbf32 -> 01717bb)

2020-01-15 Thread 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 46fbf32  Remove the deprecated JmxRemoteLifecycleListener
 new d9b030c  Delete some deprecated code planned for removal in Tomcat 10
 new 01717bb  Delete some deprecated code planned for removal in Tomcat 10

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/catalina/realm/JNDIRealm.java  |  1 -
 java/org/apache/catalina/realm/RealmBase.java  | 22 --
 java/org/apache/coyote/http11/Constants.java   | 15 ---
 java/org/apache/jasper/JspC.java   | 24 ---
 java/org/apache/tomcat/jni/OS.java |  7 
 java/org/apache/tomcat/util/buf/ByteChunk.java | 47 -
 java/org/apache/tomcat/util/buf/CharChunk.java | 30 -
 java/org/apache/tomcat/util/compat/TLS.java| 49 --
 .../tomcat/util/http/FastHttpDateFormat.java   | 40 --
 .../apache/tomcat/util/net/AbstractEndpoint.java   | 31 --
 10 files changed, 266 deletions(-)
 delete mode 100644 java/org/apache/tomcat/util/compat/TLS.java


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

[tomcat] 02/02: Delete some deprecated code planned for removal in Tomcat 10

2020-01-15 Thread markt

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

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

commit 01717bb1fa872208c63ca9757567bb2ee5dc2fb2
Author: Mark Thomas 
AuthorDate: Wed Jan 15 09:35:05 2020 +

Delete some deprecated code planned for removal in Tomcat 10
---
 java/org/apache/coyote/http11/Constants.java   | 15 ---
 java/org/apache/jasper/JspC.java   | 24 ---
 java/org/apache/tomcat/jni/OS.java |  7 
 java/org/apache/tomcat/util/buf/ByteChunk.java | 47 -
 java/org/apache/tomcat/util/buf/CharChunk.java | 30 -
 java/org/apache/tomcat/util/compat/TLS.java| 49 --
 .../tomcat/util/http/FastHttpDateFormat.java   | 40 --
 .../apache/tomcat/util/net/AbstractEndpoint.java   | 31 --
 8 files changed, 243 deletions(-)

diff --git a/java/org/apache/coyote/http11/Constants.java 
b/java/org/apache/coyote/http11/Constants.java
index 7c8bff2..700834c 100644
--- a/java/org/apache/coyote/http11/Constants.java
+++ b/java/org/apache/coyote/http11/Constants.java
@@ -103,22 +103,7 @@ public final class Constants {
 /* Various constant "strings" */
 public static final String CONNECTION = "Connection";
 public static final String CLOSE = "close";
-/**
- * @deprecated Unused. Will be removed in Tomcat 10.
- */
-@Deprecated
-public static final byte[] CLOSE_BYTES = ByteChunk.convertToBytes(CLOSE);
-/**
- * @deprecated Unused. Will be removed in Tomcat 10.
- */
-@Deprecated
-public static final String KEEPALIVE = "keep-alive";
 public static final String KEEP_ALIVE_HEADER_VALUE_TOKEN = "keep-alive";
-/**
- * @deprecated Unused. Will be removed in Tomcat 10.
- */
-@Deprecated
-public static final byte[] KEEPALIVE_BYTES = 
ByteChunk.convertToBytes(KEEPALIVE);
 public static final String CHUNKED = "chunked";
 public static final byte[] ACK_BYTES = ByteChunk.convertToBytes("HTTP/1.1 
100 " + CRLF + CRLF);
 public static final String TRANSFERENCODING = "Transfer-Encoding";
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 6bbb1b3..c973f29 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -1036,18 +1036,6 @@ public class JspC extends Task implements Options {
 }
 
 /**
- * File where we generate a web.xml fragment with the class definitions.
- * @param s New value
- * @deprecated Will be removed in Tomcat 10.
- * Use {@link #setWebXmlInclude(String)}
- */
-@Deprecated
-public void setWebXmlFragment( String s ) {
-webxmlFile=resolveFile(s).getAbsolutePath();
-webxmlLevel=INC_WEBXML;
-}
-
-/**
  * File where we generate configuration with the class definitions to be
  * included in a web.xml file.
  * @param s New value
@@ -1393,18 +1381,6 @@ public class JspC extends Task implements Options {
 }
 }
 
-/**
- * Locate all jsp files in the webapp. Used if no explicit
- * jsps are specified.
- * @param base Base path
- *
- * @deprecated This will be removed in Tomcat 10. Use {@link #scanFiles()}
- */
-@Deprecated
-public void scanFiles(File base) {
-scanFiles();
-}
-
 
 /**
  * Locate all jsp files in the webapp. Used if no explicit jsps are
diff --git a/java/org/apache/tomcat/jni/OS.java 
b/java/org/apache/tomcat/jni/OS.java
index 6796f23..c93a07b 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -46,13 +46,6 @@ public class OS {
 private static native boolean is(int type);
 
 public static final boolean IS_UNIX= is(UNIX);
-/**
- * @deprecated Hard-coded to false since there has not been a supported
- * Netware platform for many years.
- * This will be removed in Tomcat 10 onwards
- */
-@Deprecated
-public static final boolean IS_NETWARE = false;
 public static final boolean IS_WIN32   = is(WIN32);
 public static final boolean IS_WIN64   = is(WIN64);
 public static final boolean IS_LINUX   = is(LINUX);
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java 
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index da188ad..aa268ef 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -389,15 +389,6 @@ public final class ByteChunk extends AbstractChunk {
 
 //  Removing data from the buffer 
 
-/*
- * @deprecated Use {@link #subtract()}.
- * This method will be removed in Tomcat 10
- */
-@Deprecated
-public int substract() throws IOException {
-return subtract();
-}
-
 public int subtract() throws IOException {
 i

[tomcat] 01/02: Delete some deprecated code planned for removal in Tomcat 10

2020-01-15 Thread markt

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

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

commit d9b030cfb24555169c49da3306110f8f21d5cc23
Author: Mark Thomas 
AuthorDate: Wed Jan 15 09:29:43 2020 +

Delete some deprecated code planned for removal in Tomcat 10
---
 java/org/apache/catalina/realm/JNDIRealm.java |  1 -
 java/org/apache/catalina/realm/RealmBase.java | 22 --
 2 files changed, 23 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 375edc7..b814b00 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -2261,7 +2261,6 @@ public class JNDIRealm extends RealmBase {
 return getPrincipal(name, gssCredential);
 }
 
-@Override
 protected Principal getPrincipal(String username,
 GSSCredential gssCredential) {
 
diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index d9917cf..7d3464b 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1224,28 +1224,6 @@ public abstract class RealmBase extends 
LifecycleMBeanBase implements Realm {
 
 
 /**
- * Get the principal associated with the specified user name.
- *
- * @param username The user name
- * @param gssCredential the GSS credential of the principal
- * @return the principal associated with the given user name.
- * @deprecated This will be removed in Tomcat 10 onwards. Use
- * {@link #getPrincipal(GSSName, GSSCredential)} instead.
- */
-@Deprecated
-protected Principal getPrincipal(String username,
-GSSCredential gssCredential) {
-Principal p = getPrincipal(username);
-
-if (p instanceof GenericPrincipal) {
-((GenericPrincipal) p).setGssCredential(gssCredential);
-}
-
-return p;
-}
-
-
-/**
  * Get the principal associated with the specified {@link GSSName}.
  *
  * @param gssName The GSS name


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

[tomcat] branch master updated (8ae9b83 -> 46fbf32)

2020-01-15 Thread 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 8ae9b83  Update Maven snapshot version
 new fca2646  Delete some deprecated code planned for removal in Tomcat 10
 new 46fbf32  Remove the deprecated JmxRemoteLifecycleListener

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/catalina/Context.java  |  38 --
 java/org/apache/catalina/Globals.java  |  15 -
 java/org/apache/catalina/Manager.java  |  13 -
 java/org/apache/catalina/Realm.java|  17 +-
 java/org/apache/catalina/core/StandardContext.java |  37 --
 java/org/apache/catalina/filters/CorsFilter.java   |  31 -
 .../org/apache/catalina/filters/ExpiresFilter.java |  21 -
 .../apache/catalina/ha/session/DeltaManager.java   |  81 ---
 .../apache/catalina/manager/ManagerServlet.java|  23 -
 java/org/apache/catalina/mbeans/ContextMBean.java  |  17 -
 .../mbeans/JmxRemoteLifecycleListener.java | 643 -
 .../apache/catalina/mbeans/LocalStrings.properties |   9 -
 .../catalina/mbeans/LocalStrings_es.properties |  16 -
 .../catalina/mbeans/LocalStrings_fr.properties |   8 -
 .../catalina/mbeans/LocalStrings_ja.properties |   8 -
 .../catalina/mbeans/LocalStrings_ko.properties |   8 -
 .../catalina/mbeans/LocalStrings_zh_CN.properties  |  19 -
 java/org/apache/catalina/realm/RealmBase.java  |  11 -
 .../apache/catalina/servlets/DefaultServlet.java   |  45 --
 java/org/apache/catalina/session/ManagerBase.java  |   6 -
 .../org/apache/catalina/startup/FailedContext.java |   7 -
 .../catalina/tribes/transport/AbstractRxTask.java  |  28 +-
 .../apache/catalina/util/ConcurrentDateFormat.java |  79 ---
 res/findbugs/filter-false-positives.xml|   6 -
 test/org/apache/tomcat/unittest/TesterContext.java |  15 -
 webapps/docs/config/listeners.xml  | 161 --
 26 files changed, 2 insertions(+), 1360 deletions(-)
 delete mode 100644 
java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
 delete mode 100644 java/org/apache/catalina/mbeans/LocalStrings_es.properties
 delete mode 100644 
java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
 delete mode 100644 java/org/apache/catalina/util/ConcurrentDateFormat.java


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

[tomcat] 02/02: Remove the deprecated JmxRemoteLifecycleListener

2020-01-15 Thread markt

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

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

commit 46fbf32e556f39ff10dc5bceb51ec751b10f2a12
Author: Mark Thomas 
AuthorDate: Wed Jan 15 09:25:18 2020 +

Remove the deprecated JmxRemoteLifecycleListener
---
 .../mbeans/JmxRemoteLifecycleListener.java | 643 -
 .../apache/catalina/mbeans/LocalStrings.properties |   9 -
 .../catalina/mbeans/LocalStrings_es.properties |  16 -
 .../catalina/mbeans/LocalStrings_fr.properties |   8 -
 .../catalina/mbeans/LocalStrings_ja.properties |   8 -
 .../catalina/mbeans/LocalStrings_ko.properties |   8 -
 .../catalina/mbeans/LocalStrings_zh_CN.properties  |  19 -
 res/findbugs/filter-false-positives.xml|   6 -
 webapps/docs/config/listeners.xml  | 161 --
 9 files changed, 878 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 
b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
deleted file mode 100644
index 4256fb3..000
--- a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
+++ /dev/null
@@ -1,643 +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.mbeans;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.rmi.AccessException;
-import java.rmi.AlreadyBoundException;
-import java.rmi.NotBoundException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.server.RMIClientSocketFactory;
-import java.rmi.server.RMIServerSocketFactory;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXServiceURL;
-import javax.management.remote.rmi.RMIConnectorServer;
-import javax.management.remote.rmi.RMIJRMPServerImpl;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSessionContext;
-import javax.rmi.ssl.SslRMIClientSocketFactory;
-import javax.rmi.ssl.SslRMIServerSocketFactory;
-
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleListener;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.net.SSLHostConfig;
-import org.apache.tomcat.util.net.SSLHostConfigCertificate;
-import org.apache.tomcat.util.net.jsse.JSSEUtil;
-import org.apache.tomcat.util.res.StringManager;
-
-/**
- * This listener fixes the port used by JMX/RMI Server making things much
- * simpler if you need to connect jconsole or similar to a remote Tomcat
- * instance that is running behind a firewall. Only the ports are configured 
via
- * the listener. The remainder of the configuration is via the standard system
- * properties for configuring JMX.
- *
- * @deprecated The features provided by this listener are now available in the
- * remote JMX capability included with the JRE.
- * This listener will be removed in Tomcat 10 and may be removed
- * from Tomcat 9.0.x some time after 2020-12-31.
- */
-@Deprecated
-public class JmxRemoteLifecycleListener extends SSLHostConfig implements 
LifecycleListener {
-
-private static final long serialVersionUID = 1L;
-
-private static final Log log = 
LogFactory.getLog(JmxRemoteLifecycleListener.class);
-
-protected static final StringManager sm =
-StringManager.getManager(JmxRemoteLifecycleListener.class);
-
-protected String rmiBindAddress = null;
-protected int rmiRegistryPortPlatform = -1;
-protected int rmiServerPortPlatform = -1;
-protected boolean rmiRegistrySSL = true;
-protected boolean rmiServerSSL = true;
-protected boolean authenticate = true;
-protected String passwordFile = null;
-protected String loginModuleName = null;
-protected String accessFile =

[tomcat] 01/02: Delete some deprecated code planned for removal in Tomcat 10

2020-01-15 Thread markt

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

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

commit fca2646517537fd85505d448f9a09422b4619db8
Author: Mark Thomas 
AuthorDate: Wed Jan 15 09:21:03 2020 +

Delete some deprecated code planned for removal in Tomcat 10
---
 java/org/apache/catalina/Context.java  | 38 --
 java/org/apache/catalina/Globals.java  | 15 
 java/org/apache/catalina/Manager.java  | 13 
 java/org/apache/catalina/Realm.java| 17 +
 java/org/apache/catalina/core/StandardContext.java | 37 --
 java/org/apache/catalina/filters/CorsFilter.java   | 31 -
 .../org/apache/catalina/filters/ExpiresFilter.java | 21 --
 .../apache/catalina/ha/session/DeltaManager.java   | 81 --
 .../apache/catalina/manager/ManagerServlet.java| 23 --
 java/org/apache/catalina/mbeans/ContextMBean.java  | 17 -
 java/org/apache/catalina/realm/RealmBase.java  | 11 ---
 .../apache/catalina/servlets/DefaultServlet.java   | 45 
 java/org/apache/catalina/session/ManagerBase.java  |  6 --
 .../org/apache/catalina/startup/FailedContext.java |  7 --
 .../catalina/tribes/transport/AbstractRxTask.java  | 28 +---
 .../apache/catalina/util/ConcurrentDateFormat.java | 79 -
 test/org/apache/tomcat/unittest/TesterContext.java | 15 
 17 files changed, 2 insertions(+), 482 deletions(-)

diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index a41f2a0..6edaf1e 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -979,19 +979,6 @@ public interface Context extends Container, ContextBind {
 
 
 /**
- * @param exceptionType Exception type to look up
- *
- * @return the error page entry for the specified Java exception type,
- * if any; otherwise return {@code null}.
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #findErrorPage(Throwable)} instead.
- */
-@Deprecated
-public ErrorPage findErrorPage(String exceptionType);
-
-
-/**
  * Find and return the ErrorPage instance for the specified exception's
  * class, or an ErrorPage instance for the closest superclass for which
  * there is such a definition.  If no associated ErrorPage instance is
@@ -1110,31 +1097,6 @@ public interface Context extends Container, ContextBind {
 
 
 /**
- * @return the context-relative URI of the error page for the specified
- * HTTP status code, if any; otherwise return null.
- *
- * @param status HTTP status code to look up
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #findErrorPage(int)} instead.
- */
-@Deprecated
-public String findStatusPage(int status);
-
-
-/**
- * @return the set of HTTP status codes for which error pages have
- * been specified.  If none are specified, a zero-length array
- * is returned.
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #findErrorPages()} instead.
- */
-@Deprecated
-public int[] findStatusPages();
-
-
-/**
  * @return the associated ThreadBindingListener.
  */
 public ThreadBindingListener getThreadBindingListener();
diff --git a/java/org/apache/catalina/Globals.java 
b/java/org/apache/catalina/Globals.java
index 70ef0cd..640b944 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -113,21 +113,6 @@ public final class Globals {
 
 
 /**
- * The servlet context attribute under which we store a flag used
- * to mark this request as having been processed by the SSIServlet.
- * We do this because of the pathInfo mangling happening when using
- * the CGIServlet in conjunction with the SSI servlet. (value stored
- * as an object of type String)
- *
- * @deprecated Unused. This is no longer used as the CGIO servlet now has
- * generic handling for when it is used as an include.
- * This will be removed in Tomcat 10
- */
-@Deprecated
-public static final String SSI_FLAG_ATTR = 
"org.apache.catalina.ssi.SSIServlet";
-
-
-/**
  * The subject under which the AccessControlContext is running.
  */
 public static final String SUBJECT_ATTR =
diff --git a/java/org/apache/catalina/Manager.java 
b/java/org/apache/catalina/Manager.java
index d633551..fb1d306 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -216,19 +216,6 @@ public interface Manager {
  *
  * @param session   The session to change the session ID for
  *
- * @deprecated Use {@link #rotateSessionId(Session)}.
- * Will be removed in Tomcat 10
- */
-@Dep

Re: Tomcat 7.0.x end of life

2020-01-15 Thread Rémy Maucherat

On Tue, Jan 14, 2020 at 9:56 PM Mark Thomas  wrote:

> Hi all,
>
> This has been mentioned several times as we have figured out our
> approach to Jakarta EE 9 and Tomcat 10. I'd like to formally propose
> that we announce end of life for Tomcat 7.0.x as 31 March 2021.
>
> Thoughts?
>

+1

Rémy

79 matches

Mail list logo