You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/15 12:22:41 UTC
[tomcat] branch 9.0.x updated (5de844f -> 73b3db3)
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/06: Remove debug code
Posted by ma...@apache.org.
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 <ma...@apache.org>
AuthorDate: Wed Jan 15 11:44:52 2020 +0000
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", "300000"));
tomcat.start();
for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/06: Check that uses of Connector.setProperty() in tests
complete correctly
Posted by ma...@apache.org.
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 <ma...@apache.org>
AuthorDate: Wed Jan 15 11:44:40 2020 +0000
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", "300000");
+ Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "300000"));
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", "20000");
- tomcat.getConnector().setProperty("keepAliveTimeout", "50000");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", "5"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
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", "20000");
- tomcat.getConnector().setProperty("keepAliveTimeout", "50000");
- 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("maxThreads", "10"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxConnections", Integer.toString(MAX_CONNECTIONS)));
+ Assert.assertTrue(tomcat.getConnector().setProperty("acceptCount", "1"));
tomcat.start();
}
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index e479296..72e3a7b 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -255,7 +255,7 @@ public class TestSwallowAbortedUploads extends TomcatBaseTest {
Connector c = tomcat.getConnector();
c.setMaxPostSize(2 * hugeSize);
- c.setProperty("maxSwallowSize", Integer.toString(hugeSize));
+ Assert.assertTrue(c.setProperty("maxSwallowSize", Integer.toString(hugeSize)));
tomcat.start();
setPort(c.getLocalPort());
@@ -367,7 +367,7 @@ public class TestSwallowAbortedUploads extends TomcatBaseTest {
Connector c = tomcat.getConnector();
c.setMaxPostSize(2 * hugeSize);
- c.setProperty("maxSwallowSize", Integer.toString(hugeSize));
+ Assert.assertTrue(c.setProperty("maxSwallowSize", Integer.toString(hugeSize)));
setPort(c.getLocalPort());
}
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 0ac987c..efe6268 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -160,7 +160,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
// Note: Low values of socket.txBufSize can trigger very poor
// performance. Set it just low enough to ensure that the
// non-blocking write servlet will see isReady() == false
- tomcat.getConnector().setProperty("socket.txBufSize", "1048576");
+ Assert.assertTrue(tomcat.getConnector().setProperty("socket.txBufSize", "1048576"));
tomcat.start();
SocketFactory factory = SocketFactory.getDefault();
@@ -329,7 +329,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
// Note: Low values of socket.txBufSize can trigger very poor
// performance. Set it just low enough to ensure that the
// non-blocking write servlet will see isReady() == false
- tomcat.getConnector().setProperty("socket.txBufSize", "1048576");
+ Assert.assertTrue(tomcat.getConnector().setProperty("socket.txBufSize", "1048576"));
tomcat.start();
SocketFactory factory = SocketFactory.getDefault();
diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index 2bdca71..3d4f7f0 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -76,7 +76,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
Map<String, String> params = desc.getParams();
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize));
+ Assert.assertTrue(tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize)));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -193,13 +193,13 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
case "REQUEST-REMOTE-USER":
/* request.getRemoteUser() will not trust the AJP
* info if tomcatAuthentication is set. */
- tomcat.getConnector().setProperty("tomcatAuthentication", "false");
+ Assert.assertTrue(tomcat.getConnector().setProperty("tomcatAuthentication", "false"));
forwardMessage.addAttribute(0x03, value);
break;
case "REQUEST-AUTH-TYPE":
/* request.getAuthType() will not trust the AJP
* info if tomcatAuthentication is set. */
- tomcat.getConnector().setProperty("tomcatAuthentication", "false");
+ Assert.assertTrue(tomcat.getConnector().setProperty("tomcatAuthentication", "false"));
forwardMessage.addAttribute(0x04, value);
break;
case "REQUEST-QUERY-STRING":
@@ -490,7 +490,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
@Test
public void testSecret() throws Exception {
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("requiredSecret", "RIGHTSECRET");
+ Assert.assertTrue(tomcat.getConnector().setProperty("requiredSecret", "RIGHTSECRET"));
tomcat.start();
// No file system docBase required
@@ -550,7 +550,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
@Test
public void testKeepAlive() throws Exception {
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("connectionTimeout", "-1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", "-1"));
tomcat.start();
// No file system docBase required
@@ -771,7 +771,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
int ajpPacketSize = 16000;
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize));
+ Assert.assertTrue(tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize)));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/coyote/http11/TestHttp11InputBuffer.java b/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
index 131fa21..f725868 100644
--- a/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
+++ b/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
@@ -273,8 +273,8 @@ public class TestHttp11InputBuffer extends TomcatBaseTest {
try {
Connector connector = tomcat.getConnector();
- connector.setProperty("rejectIllegalHeaderName",
- Boolean.toString(rejectIllegalHeaderName));
+ Assert.assertTrue(connector.setProperty(
+ "rejectIllegalHeaderName", Boolean.toString(rejectIllegalHeaderName)));
tomcat.start();
setPort(connector.getLocalPort());
@@ -548,7 +548,7 @@ public class TestHttp11InputBuffer extends TomcatBaseTest {
try {
Connector connector = tomcat.getConnector();
- connector.setProperty("rejectIllegalHeaderName", "false");
+ Assert.assertTrue(connector.setProperty("rejectIllegalHeaderName", "false"));
tomcat.start();
setPort(connector.getLocalPort());
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java b/test/org/apache/coyote/http11/TestHttp11Processor.java
index aa48aeb..ce17ca4 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -480,8 +480,8 @@ public class TestHttp11Processor extends TomcatBaseTest {
@Test
public void testBug55772() throws Exception {
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("processorCache", "1");
- tomcat.getConnector().setProperty("maxThreads", "1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("processorCache", "1"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxThreads", "1"));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index a3a22d9..16a5894 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -101,7 +101,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
Context ctx = tomcat.addContext("", null);
// Configure allowed trailer headers
- tomcat.getConnector().setProperty("allowedTrailerHeaders", "x-trailer1,x-trailer2");
+ Assert.assertTrue(tomcat.getConnector().setProperty("allowedTrailerHeaders", "x-trailer1,x-trailer2"));
EchoHeaderServlet servlet = new EchoHeaderServlet(expectPass);
Tomcat.addServlet(ctx, "servlet", servlet);
@@ -170,7 +170,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
ctx.addServletMappingDecoded("/", "servlet");
// Limit the size of the trailing header
- tomcat.getConnector().setProperty("maxTrailerSize", "10");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxTrailerSize", "10"));
tomcat.start();
String[] request = new String[]{
@@ -223,8 +223,8 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty(
- "maxExtensionSize", Integer.toString(EXT_SIZE_LIMIT));
+ Assert.assertTrue(tomcat.getConnector().setProperty(
+ "maxExtensionSize", Integer.toString(EXT_SIZE_LIMIT)));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index f436240..7619c45 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -87,7 +87,7 @@ public class TestUpgradeInternalHandler extends TomcatBaseTest {
Class<? extends HttpUpgradeHandler> upgradeHandlerClass) throws Exception {
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("useAsyncIO", "true");
+ Assert.assertTrue(tomcat.getConnector().setProperty("useAsyncIO", "true"));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
index 4b76c97..93ddab3 100644
--- a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
+++ b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
@@ -122,7 +122,7 @@ public class TestMimeHeadersIntegration extends TomcatBaseTest {
// Bumping into maxHttpHeaderSize
Tomcat tomcat = getTomcatInstance();
setupHeadersTest(tomcat);
- tomcat.getConnector().setProperty("maxHeaderCount", "-1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxHeaderCount", "-1"));
runHeadersTest(false, tomcat, 8 * 1024, -1);
}
@@ -147,7 +147,7 @@ public class TestMimeHeadersIntegration extends TomcatBaseTest {
// Can change maxHeaderCount
Tomcat tomcat = getTomcatInstance();
setupHeadersTest(tomcat);
- tomcat.getConnector().setProperty("maxHeaderCount", "-1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxHeaderCount", "-1"));
runHeadersTest(true, tomcat, 300, -1);
}
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index fe8d8da..19f2e5e 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -75,9 +75,9 @@ public class TestClientCertTls13 extends TomcatBaseTest {
TesterSupport.configureClientCertContext(tomcat);
// Need to override some of the previous settings
- tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_3);
+ Assert.assertTrue(tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_3));
// And add force authentication to occur on the initial handshake
- tomcat.getConnector().setProperty("clientAuth", "required");
+ Assert.assertTrue(tomcat.getConnector().setProperty("clientAuth", "required"));
TesterSupport.configureClientSsl();
}
diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index 970229a..60dbf00 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -59,15 +59,15 @@ public class TestCustomSsl extends TomcatBaseTest {
Assume.assumeFalse("This test is only for JSSE based SSL connectors",
connector.getProtocolHandlerClassName().contains("Apr"));
- connector.setProperty("sslImplementationName",
- "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl");
+ Assert.assertTrue(connector.setProperty(
+ "sslImplementationName", "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl"));
// This setting will break ssl configuration unless the custom
// implementation is used.
- connector.setProperty(TesterBug50640SslImpl.PROPERTY_NAME,
- TesterBug50640SslImpl.PROPERTY_VALUE);
+ Assert.assertTrue(connector.setProperty(
+ TesterBug50640SslImpl.PROPERTY_NAME, TesterBug50640SslImpl.PROPERTY_VALUE));
- connector.setProperty("sslProtocol", "tls");
+ Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
File keystoreFile =
new File(TesterSupport.LOCALHOST_RSA_JKS);
@@ -75,7 +75,7 @@ public class TestCustomSsl extends TomcatBaseTest {
"keystoreFile", keystoreFile.getAbsolutePath());
connector.setSecure(true);
- connector.setProperty("SSLEnabled", "true");
+ Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
File appDir = new File(getBuildDirectory(), "webapps/examples");
Context ctxt = tomcat.addWebapp(
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 42029bf..90c160f 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -322,8 +322,8 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest {
connector.setPort(0);
connector.setScheme("https");
connector.setSecure(true);
- connector.setProperty("SSLEnabled", "true");
- connector.setProperty("sslImplementationName", sslImplementationName);
+ Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
+ Assert.assertTrue(connector.setProperty("sslImplementationName", sslImplementationName));
sslHostConfig.setProtocols("TLSv1.2");
connector.addSslHostConfig(sslHostConfig);
diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 00d6bb5..ab08bf7 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -155,7 +155,7 @@ public class TestXxxEndpoint extends TomcatBaseTest {
public void testStartStopBindOnStart() throws Exception {
Tomcat tomcat = getTomcatInstance();
Connector c = tomcat.getConnector();
- c.setProperty("bindOnInit", "false");
+ Assert.assertTrue(c.setProperty("bindOnInit", "false"));
File appDir = new File(getBuildDirectory(), "webapps/examples");
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java
index a795ffd..128e303 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -47,6 +47,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.junit.Assert;
+
import org.apache.catalina.Context;
import org.apache.catalina.authenticator.SSLAuthenticator;
import org.apache.catalina.connector.Connector;
@@ -145,7 +147,7 @@ public final class TesterSupport {
server.addLifecycleListener(listener);
tomcat.getConnector().setAttribute("sslImplementationName", sslImplementation);
}
- connector.setProperty("sslProtocol", "tls");
+ Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
File keystoreFile =
new File(keystore);
connector.setAttribute("keystoreFile",
@@ -174,7 +176,7 @@ public final class TesterSupport {
keystoreFile.getAbsolutePath());
}
tomcat.getConnector().setSecure(true);
- tomcat.getConnector().setProperty("SSLEnabled", "true");
+ Assert.assertTrue(tomcat.getConnector().setProperty("SSLEnabled", "true"));
}
protected static KeyManager[] getUser1KeyManagers() throws Exception {
@@ -263,7 +265,7 @@ public final class TesterSupport {
* depend. Therefore, force these tests to use TLSv1.2 so that they pass
* when running on TLSv1.3.
*/
- tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_2);
+ Assert.assertTrue(tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_2));
// Need a web application with a protected and unprotected URL
// No file system docBase required
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
index e1d5535..64bb5a7 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.websocket;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -38,7 +39,7 @@ public class TestWsWebSocketContainerWithProxy extends TestWsWebSocketContainer
// With httpd 2.2, AllowCONNECT requires fixed ports. From 2.4, a range
// can be used.
getTomcatInstance().getConnector().setPort(8080);
- getTomcatInstance().getConnector().setProperty("address","0.0.0.0");
+ Assert.assertTrue(getTomcatInstance().getConnector().setProperty("address","0.0.0.0"));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/06: Correct property name
Posted by ma...@apache.org.
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 <ma...@apache.org>
AuthorDate: Wed Jan 15 11:45:04 2020 +0000
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/06: Correct property name
Posted by ma...@apache.org.
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 <ma...@apache.org>
AuthorDate: Wed Jan 15 11:45:52 2020 +0000
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", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", "20000"));
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
init = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/06: Skip setting attribute that is neither supported
nor required for APR
Posted by ma...@apache.org.
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 <ma...@apache.org>
AuthorDate: Wed Jan 15 12:01:45 2020 +0000
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/06: Correct property name
Posted by ma...@apache.org.
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 <ma...@apache.org>
AuthorDate: Wed Jan 15 11:47:12 2020 +0000
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", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", "20000"));
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
Assert.assertTrue(tomcat.getConnector().setProperty("maxConnections", Integer.toString(MAX_CONNECTIONS)));
Assert.assertTrue(tomcat.getConnector().setProperty("acceptCount", "1"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org