Buildbot success in on tomcat-10.1.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1502 Blamelist: remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] 4b66d308b3ea02680496a6ecc61bc703cd78f6fe Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch main updated: Add option to serve resources from subpath only with WebDAV Servlet
On 13/11/2024 12:50, Michael Osipov wrote: On 2024/11/13 12:33:20 Mark Thomas wrote: On 13/11/2024 11:10, micha...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new f5601ff240 Add option to serve resources from subpath only with WebDAV Servlet f5601ff240 is described below commit f5601ff240e2c7f8cb98fe79e8e30f53b731edfd Author: Michael Osipov AuthorDate: Wed Nov 13 11:48:00 2024 +0100 Add option to serve resources from subpath only with WebDAV Servlet What is the use case for this? Simple. Serving a subset of mounted resources just like mod_dav (replacement) would w/o exposing the entire webapp resources, e.g.: webdav /dav/* Basically the same as DefaultServlet, but with DAV capabilites. Got it. Tx. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Partial put - enhance content range verification [tomcat]
Chenjp opened a new pull request, #778: URL: https://github.com/apache/tomcat/pull/778 per [rfc 9110 - 14.4](https://httpwg.org/specs/rfc9110.html#field.content-range) - ContentRange - add isValid(), more length check. - ContentRange - parse(): make sure the not-null return of parse() is valid. - force content-range unit in lowercase internally. - TestDefaultServletPut - cover issues by adding 2 sets of parameters. -- 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. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69442] Case sensitivity of http content-type
https://bz.apache.org/bugzilla/show_bug.cgi?id=69442 --- Comment #6 from Chen Jp --- Yes. Developers have to choose lowercase media-type after he find out that uppercase media-type not work on tomcat server in real world, even http rfc explicitly declare which is case-insensitive. -- 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 69442] Case sensitivity of http content-type
https://bz.apache.org/bugzilla/show_bug.cgi?id=69442
--- Comment #7 from Chen Jp ---
org.springframework.util.MimeType -- parse type and subtype in lowercase
internally.
```java
public MimeType(String type, String subtype, @Nullable Map parameters) {
Assert.hasLength(type, "'type' must not be empty");
Assert.hasLength(subtype, "'subtype' must not be empty");
checkToken(type);
checkToken(subtype);
this.type = type.toLowerCase(Locale.ROOT);
this.subtype = subtype.toLowerCase(Locale.ROOT);
if (!CollectionUtils.isEmpty(parameters)) {
Map map = new
LinkedCaseInsensitiveMap<>(parameters.size(), Locale.ROOT);
parameters.forEach((parameter, value) -> {
checkParameters(parameter, value);
map.put(parameter, value);
});
this.parameters = Collections.unmodifiableMap(map);
}
else {
this.parameters = Collections.emptyMap();
}
}
```
--
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 69444] jakarta.servlet.error.message request attribute should be empty string instead of null
https://bz.apache.org/bugzilla/show_bug.cgi?id=69444 --- Comment #1 from Konstantin Kolinko --- https://jakarta.ee/specifications/servlet/6.0/jakarta-servlet-spec-6.0#request-attributes 1. If you read further (below a table), the spec says: "With the introduction of the exception object to the attributes list for version 2.3 of this specification, the exception type and error message attributes are redundant." 2. If you call ServletRequest.getAttibuteNames(), is "jakarta.servlet.error.message" listed? If so, you cannot claim that the attribute is not set. -- 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 main updated: Save protocols attributes for SSLHostConfig
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 4667ce7d08 Save protocols attributes for SSLHostConfig
4667ce7d08 is described below
commit 4667ce7d084f58d5e459db3d27ea1c12463e7b88
Author: remm
AuthorDate: Thu Nov 14 14:00:15 2024 +0100
Save protocols attributes for SSLHostConfig
---
.../catalina/storeconfig/SSLHostConfigSF.java | 40 ++
webapps/docs/changelog.xml | 4 +++
2 files changed, 44 insertions(+)
diff --git a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
index 44bad1d973..ea6344fd79 100644
--- a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
+++ b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
@@ -19,6 +19,8 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
import java.util.ArrayList;
+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.SSLHostConfigCertificate.Type;
@@ -29,6 +31,44 @@ import org.apache.tomcat.util.net.openssl.OpenSSLConf;
*/
public class SSLHostConfigSF extends StoreFactoryBase {
+private static Log log = LogFactory.getLog(SSLHostConfigSF.class);
+
+@Override
+public void store(PrintWriter aWriter, int indent, Object aElement) throws
Exception {
+StoreDescription elementDesc =
getRegistry().findDescription(aElement.getClass());
+if (elementDesc != null) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+}
+getStoreAppender().printIndent(aWriter, indent + 2);
+aWriter.print("<");
+aWriter.print(elementDesc.getTag());
+if (elementDesc.isAttributes() && aElement != null) {
+// Add protocols attribute
+SSLHostConfig bean2 = (SSLHostConfig)
getStoreAppender().defaultInstance(aElement);
+SSLHostConfig sslHostConfig = (SSLHostConfig) aElement;
+if
(!bean2.getProtocols().equals(sslHostConfig.getProtocols())) {
+StringBuffer protocolsValue = new StringBuffer();
+for (String protocol : sslHostConfig.getProtocols()) {
+protocolsValue.append('+').append(protocol);
+}
+if (!protocolsValue.isEmpty()) {
+getStoreAppender().printValue(aWriter, indent,
"protocols", protocolsValue.toString());
+}
+}
+getStoreAppender().printAttributes(aWriter, indent, aElement,
elementDesc);
+}
+aWriter.println(">");
+storeChildren(aWriter, indent + 2, aElement, elementDesc);
+getStoreAppender().printIndent(aWriter, indent + 2);
+getStoreAppender().printCloseTag(aWriter, elementDesc);
+} else {
+if (log.isWarnEnabled()) {
+log.warn(sm.getString("factory.storeNoDescriptor",
aElement.getClass()));
+}
+}
+}
+
/**
* Store nested SSLHostConfigCertificate elements.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3f03b7422..349814e596 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,10 @@
HttpServletResponse.sendEarlyHints(). (markt)
+
+Add special handling for the protocols attribute of
+SSLHostConfig in storeconfig. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Empty value is ok
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3f54c6c304 Empty value is ok
3f54c6c304 is described below
commit 3f54c6c3046fa2e202029e20800dc4d7a7da7c9e
Author: remm
AuthorDate: Thu Nov 14 14:09:01 2024 +0100
Empty value is ok
---
java/org/apache/catalina/storeconfig/SSLHostConfigSF.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
index ea6344fd79..4fa6f06722 100644
--- a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
+++ b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
@@ -52,9 +52,7 @@ public class SSLHostConfigSF extends StoreFactoryBase {
for (String protocol : sslHostConfig.getProtocols()) {
protocolsValue.append('+').append(protocol);
}
-if (!protocolsValue.isEmpty()) {
-getStoreAppender().printValue(aWriter, indent,
"protocols", protocolsValue.toString());
-}
+getStoreAppender().printValue(aWriter, indent,
"protocols", protocolsValue.toString());
}
getStoreAppender().printAttributes(aWriter, indent, aElement,
elementDesc);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Save protocols attributes for SSLHostConfig
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new a3d61bb5a5 Save protocols attributes for SSLHostConfig
a3d61bb5a5 is described below
commit a3d61bb5a576a5e2b5aa84a38dc18bd12f5d59b7
Author: remm
AuthorDate: Thu Nov 14 14:00:15 2024 +0100
Save protocols attributes for SSLHostConfig
---
.../catalina/storeconfig/SSLHostConfigSF.java | 38 ++
webapps/docs/changelog.xml | 4 +++
2 files changed, 42 insertions(+)
diff --git a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
index 44bad1d973..4fa6f06722 100644
--- a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
+++ b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
@@ -19,6 +19,8 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
import java.util.ArrayList;
+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.SSLHostConfigCertificate.Type;
@@ -29,6 +31,42 @@ import org.apache.tomcat.util.net.openssl.OpenSSLConf;
*/
public class SSLHostConfigSF extends StoreFactoryBase {
+private static Log log = LogFactory.getLog(SSLHostConfigSF.class);
+
+@Override
+public void store(PrintWriter aWriter, int indent, Object aElement) throws
Exception {
+StoreDescription elementDesc =
getRegistry().findDescription(aElement.getClass());
+if (elementDesc != null) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+}
+getStoreAppender().printIndent(aWriter, indent + 2);
+aWriter.print("<");
+aWriter.print(elementDesc.getTag());
+if (elementDesc.isAttributes() && aElement != null) {
+// Add protocols attribute
+SSLHostConfig bean2 = (SSLHostConfig)
getStoreAppender().defaultInstance(aElement);
+SSLHostConfig sslHostConfig = (SSLHostConfig) aElement;
+if
(!bean2.getProtocols().equals(sslHostConfig.getProtocols())) {
+StringBuffer protocolsValue = new StringBuffer();
+for (String protocol : sslHostConfig.getProtocols()) {
+protocolsValue.append('+').append(protocol);
+}
+getStoreAppender().printValue(aWriter, indent,
"protocols", protocolsValue.toString());
+}
+getStoreAppender().printAttributes(aWriter, indent, aElement,
elementDesc);
+}
+aWriter.println(">");
+storeChildren(aWriter, indent + 2, aElement, elementDesc);
+getStoreAppender().printIndent(aWriter, indent + 2);
+getStoreAppender().printCloseTag(aWriter, elementDesc);
+} else {
+if (log.isWarnEnabled()) {
+log.warn(sm.getString("factory.storeNoDescriptor",
aElement.getClass()));
+}
+}
+}
+
/**
* Store nested SSLHostConfigCertificate elements.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1bc004509c..83fd176c47 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Add option to serve resources from subpath only with WebDAV Servlet
like
with DefaultServlet. (michaelo)
+
+Add special handling for the protocols attribute of
+SSLHostConfig in storeconfig. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69444] jakarta.servlet.error.message request attribute should be empty string instead of null
https://bz.apache.org/bugzilla/show_bug.cgi?id=69444 --- Comment #3 from Paolo B. --- talking with @BalusC (https://stackoverflow.com/users/157882/balusc) he said that there are 2 problems: 1) "non-exceptional" errors, like 404 have no "exception" attribute 2) "jakarta.servlet.error.message" is not present in the request.getAttibuteNames() Enumeration On Faces (JSF) side it seems that there are no other places to detect if it's an error page This is needed to avoid the JSF restore phase that in turn will throw a ViewExpiredException -- 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 69444] jakarta.servlet.error.message request attribute should be empty string instead of null
https://bz.apache.org/bugzilla/show_bug.cgi?id=69444
--- Comment #4 from Paolo B. ---
confirmed
on an error page mapped with java.lang.Throwable
#{requestScope.containsKey('jakarta.servlet.error.message')}
print "false"
--
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 main updated: Add bind address for CI
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 51f6f0aa76 Add bind address for CI
51f6f0aa76 is described below
commit 51f6f0aa763b2f044680b180f5df77bff2aceef1
Author: remm
AuthorDate: Thu Nov 14 15:55:10 2024 +0100
Add bind address for CI
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index 42fc8a5690..b80155047e 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -84,6 +84,7 @@ public class TestStoreConfig extends TomcatBaseTest {
org.apache.catalina.ha.tcp.SimpleTcpCluster tc_SimpleTcpCluster_51 =
new org.apache.catalina.ha.tcp.SimpleTcpCluster();
org.apache.catalina.tribes.group.GroupChannel tc_GroupChannel_52 = new
org.apache.catalina.tribes.group.GroupChannel();
+((org.apache.catalina.tribes.transport.ReceiverBase)
tc_GroupChannel_52.getChannelReceiver()).setHost("localhost");
org.apache.catalina.tribes.membership.cloud.CloudMembershipService
tc_CloudMembershipService_53 =
new
org.apache.catalina.tribes.membership.cloud.CloudMembershipService();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/1389 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 11.0.x] b3542de9ddbaae5a029476a459f23883f42f523a Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69442] Case sensitivity of http content-type
https://bz.apache.org/bugzilla/show_bug.cgi?id=69442 Mark Thomas changed: What|Removed |Added OS||All --- Comment #2 from Mark Thomas --- For the record. RFC 2045, section 2: All media type values, subtype values, and parameter names as defined are case-insensitive. However, parameter values are case-sensitive unless otherwise specified for the specific parameter. Note: charset is one of the explicitly case insensitive values We need to fix this and should check if there are any other places where we are treating the type, subtype or parameter name as case sensitive. -- 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 69442] New: Case sensitivity of http content-type
https://bz.apache.org/bugzilla/show_bug.cgi?id=69442 Bug ID: 69442 Summary: Case sensitivity of http content-type Product: Tomcat 10 Version: 10.1.33 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ch...@msn.com Target Milestone: -- Get unexpected response when post with uppercase content-type field. See: --- curl -X POST http://localhost/echo.jsp?ver=2024.11.14 -H "Content-Type: application/x-www-form-urlencoded" -d username=tomcat1 Parameter name & value pair: ver=2024.11.14 Parameter name & value pair: username=tomcat1 --- curl -X POST http://localhost/echo.jsp?ver=2024.11.14 -H "Content-Type: APPLICATION/x-www-form-urlencoded" -d username=tomcat1 Parameter name & value pair: ver=2024.11.14 --- -- 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 69442] Case sensitivity of http content-type
https://bz.apache.org/bugzilla/show_bug.cgi?id=69442 --- Comment #1 from Chen Jp --- Created attachment 39930 --> https://bz.apache.org/bugzilla/attachment.cgi?id=39930&action=edit Testcase testcase added. -- 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 10.1.x updated: Add bind address for CI
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e3fb273dab Add bind address for CI
e3fb273dab is described below
commit e3fb273dabc79019ec567bb0e378730718138e2c
Author: remm
AuthorDate: Thu Nov 14 15:55:10 2024 +0100
Add bind address for CI
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index 42fc8a5690..b80155047e 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -84,6 +84,7 @@ public class TestStoreConfig extends TomcatBaseTest {
org.apache.catalina.ha.tcp.SimpleTcpCluster tc_SimpleTcpCluster_51 =
new org.apache.catalina.ha.tcp.SimpleTcpCluster();
org.apache.catalina.tribes.group.GroupChannel tc_GroupChannel_52 = new
org.apache.catalina.tribes.group.GroupChannel();
+((org.apache.catalina.tribes.transport.ReceiverBase)
tc_GroupChannel_52.getChannelReceiver()).setHost("localhost");
org.apache.catalina.tribes.membership.cloud.CloudMembershipService
tc_CloudMembershipService_53 =
new
org.apache.catalina.tribes.membership.cloud.CloudMembershipService();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Remove missing operations
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new a1de27781b Remove missing operations a1de27781b is described below commit a1de27781b467bf9b1bd1bbf8ccf7498624bd6c7 Author: remm AuthorDate: Thu Nov 14 16:10:06 2024 +0100 Remove missing operations --- .../apache/catalina/storeconfig/mbeans-descriptors.xml | 18 -- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml index 06aad64a8a..8f9a8c1c0c 100644 --- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml +++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml @@ -26,9 +26,11 @@ domain="Catalina" group="StoreConfig" type="org.apache.catalina.storeconfig.StoreConfig"> + + @@ -59,6 +61,7 @@ description="store all or store only internal server.xml context (configFile == null)" type="boolean"/> + @@ -67,6 +70,7 @@ type="org.apache.catalina.Server" /> + @@ -74,20 +78,6 @@ description="Context" type="org.apache.catalina.Context"/> - - - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Remove missing operations
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 8f87aaf16f Remove missing operations 8f87aaf16f is described below commit 8f87aaf16fc08337f252a335df070495aed275a6 Author: remm AuthorDate: Thu Nov 14 16:10:06 2024 +0100 Remove missing operations --- .../apache/catalina/storeconfig/mbeans-descriptors.xml | 18 -- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml index 06aad64a8a..8f9a8c1c0c 100644 --- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml +++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml @@ -26,9 +26,11 @@ domain="Catalina" group="StoreConfig" type="org.apache.catalina.storeconfig.StoreConfig"> + + @@ -59,6 +61,7 @@ description="store all or store only internal server.xml context (configFile == null)" type="boolean"/> + @@ -67,6 +70,7 @@ type="org.apache.catalina.Server" /> + @@ -74,20 +78,6 @@ description="Context" type="org.apache.catalina.Context"/> - - - - - - - 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 missing operations
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 f6595dae0a Remove missing operations f6595dae0a is described below commit f6595dae0a1011796539af69bfdc9fced04e242a Author: remm AuthorDate: Thu Nov 14 16:10:06 2024 +0100 Remove missing operations --- .../apache/catalina/storeconfig/mbeans-descriptors.xml | 18 -- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml index 06aad64a8a..8f9a8c1c0c 100644 --- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml +++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml @@ -26,9 +26,11 @@ domain="Catalina" group="StoreConfig" type="org.apache.catalina.storeconfig.StoreConfig"> + + @@ -59,6 +61,7 @@ description="store all or store only internal server.xml context (configFile == null)" type="boolean"/> + @@ -67,6 +70,7 @@ type="org.apache.catalina.Server" /> + @@ -74,20 +78,6 @@ description="Context" type="org.apache.catalina.Context"/> - - - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: changeit is the default password on Tomcat 11 and earlier
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e79ecefced changeit is the default password on Tomcat 11 and earlier
e79ecefced is described below
commit e79ecefced62fe0e549784d44a4900f6a5d1866c
Author: remm
AuthorDate: Thu Nov 14 16:26:28 2024 +0100
changeit is the default password on Tomcat 11 and earlier
As a result, it will not get saved.
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index b80155047e..01baa0add7 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -77,7 +77,7 @@ public class TestStoreConfig extends TomcatBaseTest {
new
org.apache.tomcat.util.net.SSLHostConfigCertificate(tc_SSLHostConfig_22,
org.apache.tomcat.util.net.SSLHostConfigCertificate.Type.RSA);
tc_SSLHostConfigCertificate_23.setCertificateKeystoreFile("conf/localhost-rsa.jks");
-
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("changeit");
+
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("mypassword");
tc_SSLHostConfig_22.addCertificate(tc_SSLHostConfigCertificate_23);
tomcat.getConnector().addSslHostConfig(tc_SSLHostConfig_22);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Remove missing operations
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 96d76740d6 Remove missing operations 96d76740d6 is described below commit 96d76740d65c67e9729e74567d8f8ae0bf1478b4 Author: remm AuthorDate: Thu Nov 14 16:10:06 2024 +0100 Remove missing operations --- .../apache/catalina/storeconfig/mbeans-descriptors.xml | 18 -- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml index 06aad64a8a..8f9a8c1c0c 100644 --- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml +++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml @@ -26,9 +26,11 @@ domain="Catalina" group="StoreConfig" type="org.apache.catalina.storeconfig.StoreConfig"> + + @@ -59,6 +61,7 @@ description="store all or store only internal server.xml context (configFile == null)" type="boolean"/> + @@ -67,6 +70,7 @@ type="org.apache.catalina.Server" /> + @@ -74,20 +78,6 @@ description="Context" type="org.apache.catalina.Context"/> - - - - - - - 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: Add bind address for CI
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 9664d885c7 Add bind address for CI
9664d885c7 is described below
commit 9664d885c7893b3408c5b8d6790359170d4083d5
Author: remm
AuthorDate: Thu Nov 14 15:55:10 2024 +0100
Add bind address for CI
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index 42fc8a5690..b80155047e 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -84,6 +84,7 @@ public class TestStoreConfig extends TomcatBaseTest {
org.apache.catalina.ha.tcp.SimpleTcpCluster tc_SimpleTcpCluster_51 =
new org.apache.catalina.ha.tcp.SimpleTcpCluster();
org.apache.catalina.tribes.group.GroupChannel tc_GroupChannel_52 = new
org.apache.catalina.tribes.group.GroupChannel();
+((org.apache.catalina.tribes.transport.ReceiverBase)
tc_GroupChannel_52.getChannelReceiver()).setHost("localhost");
org.apache.catalina.tribes.membership.cloud.CloudMembershipService
tc_CloudMembershipService_53 =
new
org.apache.catalina.tribes.membership.cloud.CloudMembershipService();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Add bind address for CI
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new d2e9f58f51 Add bind address for CI
d2e9f58f51 is described below
commit d2e9f58f51e6a08ba10de0401a51e4ba867f2f5e
Author: remm
AuthorDate: Thu Nov 14 15:55:10 2024 +0100
Add bind address for CI
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index 42fc8a5690..b80155047e 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -84,6 +84,7 @@ public class TestStoreConfig extends TomcatBaseTest {
org.apache.catalina.ha.tcp.SimpleTcpCluster tc_SimpleTcpCluster_51 =
new org.apache.catalina.ha.tcp.SimpleTcpCluster();
org.apache.catalina.tribes.group.GroupChannel tc_GroupChannel_52 = new
org.apache.catalina.tribes.group.GroupChannel();
+((org.apache.catalina.tribes.transport.ReceiverBase)
tc_GroupChannel_52.getChannelReceiver()).setHost("localhost");
org.apache.catalina.tribes.membership.cloud.CloudMembershipService
tc_CloudMembershipService_53 =
new
org.apache.catalina.tribes.membership.cloud.CloudMembershipService();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: changeit is the default password on Tomcat 11 and earlier
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 9f294ddc50 changeit is the default password on Tomcat 11 and earlier
9f294ddc50 is described below
commit 9f294ddc5010c0c33390f784ccd2e5473d6579eb
Author: remm
AuthorDate: Thu Nov 14 16:26:28 2024 +0100
changeit is the default password on Tomcat 11 and earlier
As a result, it will not get saved.
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index b80155047e..01baa0add7 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -77,7 +77,7 @@ public class TestStoreConfig extends TomcatBaseTest {
new
org.apache.tomcat.util.net.SSLHostConfigCertificate(tc_SSLHostConfig_22,
org.apache.tomcat.util.net.SSLHostConfigCertificate.Type.RSA);
tc_SSLHostConfigCertificate_23.setCertificateKeystoreFile("conf/localhost-rsa.jks");
-
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("changeit");
+
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("mypassword");
tc_SSLHostConfig_22.addCertificate(tc_SSLHostConfigCertificate_23);
tomcat.getConnector().addSslHostConfig(tc_SSLHostConfig_22);
-
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: changeit is the default password on Tomcat 11 and earlier
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 5d6ad5c000 changeit is the default password on Tomcat 11 and earlier
5d6ad5c000 is described below
commit 5d6ad5c00036ac9162e61c4e26948afb732b8136
Author: remm
AuthorDate: Thu Nov 14 16:26:28 2024 +0100
changeit is the default password on Tomcat 11 and earlier
As a result, it will not get saved.
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index b80155047e..01baa0add7 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -77,7 +77,7 @@ public class TestStoreConfig extends TomcatBaseTest {
new
org.apache.tomcat.util.net.SSLHostConfigCertificate(tc_SSLHostConfig_22,
org.apache.tomcat.util.net.SSLHostConfigCertificate.Type.RSA);
tc_SSLHostConfigCertificate_23.setCertificateKeystoreFile("conf/localhost-rsa.jks");
-
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("changeit");
+
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("mypassword");
tc_SSLHostConfig_22.addCertificate(tc_SSLHostConfigCertificate_23);
tomcat.getConnector().addSslHostConfig(tc_SSLHostConfig_22);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: changeit is the default password on Tomcat 11 and earlier
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4b66d308b3 changeit is the default password on Tomcat 11 and earlier
4b66d308b3 is described below
commit 4b66d308b3ea02680496a6ecc61bc703cd78f6fe
Author: remm
AuthorDate: Thu Nov 14 16:26:28 2024 +0100
changeit is the default password on Tomcat 11 and earlier
As a result, it will not get saved.
---
test/org/apache/catalina/storeconfig/TestStoreConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index b80155047e..01baa0add7 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -77,7 +77,7 @@ public class TestStoreConfig extends TomcatBaseTest {
new
org.apache.tomcat.util.net.SSLHostConfigCertificate(tc_SSLHostConfig_22,
org.apache.tomcat.util.net.SSLHostConfigCertificate.Type.RSA);
tc_SSLHostConfigCertificate_23.setCertificateKeystoreFile("conf/localhost-rsa.jks");
-
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("changeit");
+
tc_SSLHostConfigCertificate_23.setCertificateKeystorePassword("mypassword");
tc_SSLHostConfig_22.addCertificate(tc_SSLHostConfigCertificate_23);
tomcat.getConnector().addSslHostConfig(tc_SSLHostConfig_22);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1501 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] 82bf6897b509f6ff20153e2745ad524297650036 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/1390 Blamelist: remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 11.0.x] 9f294ddc5010c0c33390f784ccd2e5473d6579eb Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69442] Case sensitivity of http content-type
https://bz.apache.org/bugzilla/show_bug.cgi?id=69442 --- Comment #5 from Remy Maucherat --- Clearly a bug that does not exist in the real world. -- 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 main updated: Add missing quotes to the parameter
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 6735738cba Add missing quotes to the parameter
6735738cba is described below
commit 6735738cba15d678a03707592dd412051a69d1b1
Author: remm
AuthorDate: Thu Nov 14 12:41:18 2024 +0100
Add missing quotes to the parameter
---
java/org/apache/catalina/startup/ConnectorCreateRule.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/startup/ConnectorCreateRule.java
b/java/org/apache/catalina/startup/ConnectorCreateRule.java
index 3452eefe31..93bfe4e925 100644
--- a/java/org/apache/catalina/startup/ConnectorCreateRule.java
+++ b/java/org/apache/catalina/startup/ConnectorCreateRule.java
@@ -69,8 +69,8 @@ public class ConnectorCreateRule extends Rule {
code.append(System.lineSeparator());
if (ex != null) {
code.append(digester.toVariableName(con)).append(".getProtocolHandler().setExecutor(");
-
code.append(digester.toVariableName(svc)).append(".getExecutor(").append(executorName);
-code.append("));");
+
code.append(digester.toVariableName(svc)).append(".getExecutor(\"").append(executorName);
+code.append("\"));");
code.append(System.lineSeparator());
}
if (sslImplementationName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Add missing quotes to the parameter
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 06f4e4db57 Add missing quotes to the parameter
06f4e4db57 is described below
commit 06f4e4db57ceef68a98e62d1f2c47b9271fe92d9
Author: remm
AuthorDate: Thu Nov 14 12:41:18 2024 +0100
Add missing quotes to the parameter
---
java/org/apache/catalina/startup/ConnectorCreateRule.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/startup/ConnectorCreateRule.java
b/java/org/apache/catalina/startup/ConnectorCreateRule.java
index 3452eefe31..93bfe4e925 100644
--- a/java/org/apache/catalina/startup/ConnectorCreateRule.java
+++ b/java/org/apache/catalina/startup/ConnectorCreateRule.java
@@ -69,8 +69,8 @@ public class ConnectorCreateRule extends Rule {
code.append(System.lineSeparator());
if (ex != null) {
code.append(digester.toVariableName(con)).append(".getProtocolHandler().setExecutor(");
-
code.append(digester.toVariableName(svc)).append(".getExecutor(").append(executorName);
-code.append("));");
+
code.append(digester.toVariableName(svc)).append(".getExecutor(\"").append(executorName);
+code.append("\"));");
code.append(System.lineSeparator());
}
if (sslImplementationName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add missing quotes to the parameter
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new dda712bd0a Add missing quotes to the parameter
dda712bd0a is described below
commit dda712bd0a6fe8f7f1c29129c356a4b8b4c4e0b1
Author: remm
AuthorDate: Thu Nov 14 12:41:18 2024 +0100
Add missing quotes to the parameter
---
java/org/apache/catalina/startup/ConnectorCreateRule.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/startup/ConnectorCreateRule.java
b/java/org/apache/catalina/startup/ConnectorCreateRule.java
index 91aa97d24c..3ddb8b985a 100644
--- a/java/org/apache/catalina/startup/ConnectorCreateRule.java
+++ b/java/org/apache/catalina/startup/ConnectorCreateRule.java
@@ -69,8 +69,8 @@ public class ConnectorCreateRule extends Rule {
code.append(System.lineSeparator());
if (ex != null) {
code.append(digester.toVariableName(con)).append(".getProtocolHandler().setExecutor(");
-
code.append(digester.toVariableName(svc)).append(".getExecutor(").append(executorName);
-code.append("));");
+
code.append(digester.toVariableName(svc)).append(".getExecutor(\"").append(executorName);
+code.append("\"));");
code.append(System.lineSeparator());
}
if (sslImplementationName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69444] New: jakarta.servlet.error.message request attribute should be empty string instead of null
https://bz.apache.org/bugzilla/show_bug.cgi?id=69444 Bug ID: 69444 Summary: jakarta.servlet.error.message request attribute should be empty string instead of null Product: Tomcat 10 Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Servlet Assignee: dev@tomcat.apache.org Reporter: pi...@tiscali.it Target Milestone: -- Original issue with OmniFaces/Mojarra/Tomcat stack https://github.com/omnifaces/omnifaces/issues/865#issuecomment-2444891221 When using java.lang.Throwable instead of 500 the jakarta.servlet.error.message request attribute becomes null when the thrown exception has no message. When using 500 the jakarta.servlet.error.message request attribute becomes an empty string when the thrown exception has no message. Tomcat could also have been wrong by setting the jakarta.servlet.error.message request attribute with a null value instead of an empty string because the Servlet spec says that these request attributes "must be set" which implies that these may not be null in first place. https://jakarta.ee/specifications/servlet/6.0/jakarta-servlet-spec-6.0#request-attributes -- 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: Add missing quotes to the parameter
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 0180ed9962 Add missing quotes to the parameter
0180ed9962 is described below
commit 0180ed9962e7bed66e6df46d5d6f63325cf49c87
Author: remm
AuthorDate: Thu Nov 14 12:41:18 2024 +0100
Add missing quotes to the parameter
---
java/org/apache/catalina/startup/ConnectorCreateRule.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/startup/ConnectorCreateRule.java
b/java/org/apache/catalina/startup/ConnectorCreateRule.java
index 91aa97d24c..3ddb8b985a 100644
--- a/java/org/apache/catalina/startup/ConnectorCreateRule.java
+++ b/java/org/apache/catalina/startup/ConnectorCreateRule.java
@@ -69,8 +69,8 @@ public class ConnectorCreateRule extends Rule {
code.append(System.lineSeparator());
if (ex != null) {
code.append(digester.toVariableName(con)).append(".getProtocolHandler().setExecutor(");
-
code.append(digester.toVariableName(svc)).append(".getExecutor(").append(executorName);
-code.append("));");
+
code.append(digester.toVariableName(svc)).append(".getExecutor(\"").append(executorName);
+code.append("\"));");
code.append(System.lineSeparator());
}
if (sslImplementationName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Domain attribute should be transient
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 47da8bcd35 Domain attribute should be transient 47da8bcd35 is described below commit 47da8bcd359b9f38db0cd2b0f00f7639679899d2 Author: remm AuthorDate: Thu Nov 14 12:46:41 2024 +0100 Domain attribute should be transient --- java/org/apache/catalina/storeconfig/server-registry.xml | 8 1 file changed, 8 insertions(+) diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml b/java/org/apache/catalina/storeconfig/server-registry.xml index 856e6f2195..c35080e995 100644 --- a/java/org/apache/catalina/storeconfig/server-registry.xml +++ b/java/org/apache/catalina/storeconfig/server-registry.xml @@ -24,6 +24,7 @@ children="true" tagClass="org.apache.catalina.core.StandardServer" storeFactoryClass="org.apache.catalina.storeconfig.StandardServerSF"> +domain +domain +domain +domain +domain clusterName +domain org.apache.catalina.valves.CertificatesValve org.apache.catalina.valves.ErrorReportValve org.apache.catalina.valves.RequestListenerValve + domain + domain
(tomcat) branch main updated: Remove entries
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7a69f1e5de Remove entries 7a69f1e5de is described below commit 7a69f1e5de35a2ac36ecbded0c0b2fd3839c1a2c Author: remm AuthorDate: Thu Nov 14 13:56:33 2024 +0100 Remove entries --- webapps/docs/changelog.xml | 8 1 file changed, 8 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0fe94c3a63..d3f03b7422 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -122,14 +122,6 @@ Add support for the new Servlet API method HttpServletResponse.sendEarlyHints(). (markt) - -Remove default value (was catalina) for the -secret init parameter of the WebDAV Servlet. (remm) - - -Add option to serve resources from subpath only with WebDAV Servlet like -with DefaultServlet. (michaelo) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69444] jakarta.servlet.error.message request attribute should be empty string instead of null
https://bz.apache.org/bugzilla/show_bug.cgi?id=69444 --- Comment #2 from Paolo B. --- so we could simply modify Mojarra to check if there is an exception or if the jakarta.servlet.error.message is present... thanks for the clarification! -- 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 11.0.x updated: Domain attribute should be transient
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new e71f94e006 Domain attribute should be transient e71f94e006 is described below commit e71f94e0069365e499cfe1b620f142a8ec7c2734 Author: remm AuthorDate: Thu Nov 14 12:46:41 2024 +0100 Domain attribute should be transient --- java/org/apache/catalina/storeconfig/server-registry.xml | 8 1 file changed, 8 insertions(+) diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml b/java/org/apache/catalina/storeconfig/server-registry.xml index 856e6f2195..c35080e995 100644 --- a/java/org/apache/catalina/storeconfig/server-registry.xml +++ b/java/org/apache/catalina/storeconfig/server-registry.xml @@ -24,6 +24,7 @@ children="true" tagClass="org.apache.catalina.core.StandardServer" storeFactoryClass="org.apache.catalina.storeconfig.StandardServerSF"> +domain +domain +domain +domain +domain clusterName +domain org.apache.catalina.valves.CertificatesValve org.apache.catalina.valves.ErrorReportValve org.apache.catalina.valves.RequestListenerValve + domain + domain
(tomcat) branch 10.1.x updated: Domain attribute should be transient
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 0434bc0471 Domain attribute should be transient 0434bc0471 is described below commit 0434bc04711cde70d3c39bc83e72899345e1c4f0 Author: remm AuthorDate: Thu Nov 14 12:46:41 2024 +0100 Domain attribute should be transient --- java/org/apache/catalina/storeconfig/server-registry.xml | 8 1 file changed, 8 insertions(+) diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml b/java/org/apache/catalina/storeconfig/server-registry.xml index 4dd7ddec70..29897abd51 100644 --- a/java/org/apache/catalina/storeconfig/server-registry.xml +++ b/java/org/apache/catalina/storeconfig/server-registry.xml @@ -24,6 +24,7 @@ children="true" tagClass="org.apache.catalina.core.StandardServer" storeFactoryClass="org.apache.catalina.storeconfig.StandardServerSF"> +domain +domain +domain +domain +domain clusterName +domain org.apache.catalina.valves.CertificatesValve org.apache.catalina.valves.ErrorReportValve org.apache.catalina.valves.RequestListenerValve + domain + domain
(tomcat) branch 9.0.x updated: Domain attribute should be transient
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 9146dbcf32 Domain attribute should be transient 9146dbcf32 is described below commit 9146dbcf32c8a664ae4d204d4531baf89987fba3 Author: remm AuthorDate: Thu Nov 14 12:46:41 2024 +0100 Domain attribute should be transient --- java/org/apache/catalina/storeconfig/server-registry.xml | 8 1 file changed, 8 insertions(+) diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml b/java/org/apache/catalina/storeconfig/server-registry.xml index 5ab9228666..11e0e6d433 100644 --- a/java/org/apache/catalina/storeconfig/server-registry.xml +++ b/java/org/apache/catalina/storeconfig/server-registry.xml @@ -24,6 +24,7 @@ children="true" tagClass="org.apache.catalina.core.StandardServer" storeFactoryClass="org.apache.catalina.storeconfig.StandardServerSF"> +domain +domain +domain +domain SSLProtocol sslEnabledProtocols @@ -221,6 +225,7 @@ children="true" tagClass="org.apache.catalina.session.PersistentManager" storeFactoryClass="org.apache.catalina.storeconfig.PersistentManagerSF"> +domain clusterName +domain org.apache.catalina.valves.CertificatesValve org.apache.catalina.valves.ErrorReportValve org.apache.catalina.valves.RequestListenerValve + domain + domain
(tomcat) branch 11.0.x updated: Add dedicated storeconfig test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new b3542de9dd Add dedicated storeconfig test
b3542de9dd is described below
commit b3542de9ddbaae5a029476a459f23883f42f523a
Author: remm
AuthorDate: Thu Nov 14 14:20:18 2024 +0100
Add dedicated storeconfig test
---
.../catalina/storeconfig/TestStoreConfig.java | 147 +
1 file changed, 147 insertions(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
new file mode 100644
index 00..42fc8a5690
--- /dev/null
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -0,0 +1,147 @@
+/*
+ * 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.storeconfig;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Catalina;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.IOTools;
+import org.xml.sax.InputSource;
+
+public class TestStoreConfig extends TomcatBaseTest {
+
+@Test
+public void testListener() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+tomcat.enableNaming();
+StoreConfigLifecycleListener storeConfigListener = new
StoreConfigLifecycleListener();
+tomcat.getServer().addLifecycleListener(storeConfigListener);
+
+// Create various components (from generated embedded code; startup
errors must not be fatal)
+
+org.apache.catalina.deploy.NamingResourcesImpl
tc_NamingResourcesImpl_11 = new
org.apache.catalina.deploy.NamingResourcesImpl();
+org.apache.tomcat.util.descriptor.web.ContextResource
tc_ContextResource_12 = new
org.apache.tomcat.util.descriptor.web.ContextResource();
+tc_ContextResource_12.setName("UserDatabase");
+tc_ContextResource_12.setAuth("Container");
+tc_ContextResource_12.setType("org.apache.catalina.UserDatabase");
+tc_ContextResource_12.setDescription("User database that can be
updated and saved");
+tc_ContextResource_12.setProperty("factory",
"org.apache.catalina.users.MemoryUserDatabaseFactory");
+tc_ContextResource_12.setProperty("pathname", "conf/tomcat-users.xml");
+tc_NamingResourcesImpl_11.addResource(tc_ContextResource_12);
+tomcat.getServer().setGlobalNamingResources(tc_NamingResourcesImpl_11);
+
+org.apache.catalina.core.StandardThreadExecutor
tc_StandardThreadExecutor_14 = new
org.apache.catalina.core.StandardThreadExecutor();
+tc_StandardThreadExecutor_14.setName("tomcatThreadPool");
+tc_StandardThreadExecutor_14.setNamePrefix("catalina-exec-");
+tc_StandardThreadExecutor_14.setMaxThreads(Integer.valueOf("150"));
+tc_StandardThreadExecutor_14.setMinSpareThreads(Integer.valueOf("4"));
+tomcat.getService().addExecutor(tc_StandardThreadExecutor_14);
+
+org.apache.coyote.http2.Http2Protocol tc_Http2Protocol_17 = new
org.apache.coyote.http2.Http2Protocol();
+tomcat.getConnector().addUpgradeProtocol(tc_Http2Protocol_17);
+tomcat.getConnector().setProperty("SSLEnabled", "true");
+tomcat.getConnector().setScheme("https");
+tomcat.getConnector().setSecure(Boolean.valueOf("true"));
+tomcat.getConnector().setThrowOnFailure(false);
+
tomcat.getConnector().getProtocolHandler().setExecutor(tomcat.getService().getExecutor("tomcatThreadPool"));
+
+org.apache.tomcat.util.net.SSLHostConfig tc_SSLHostConfig_22 = new
org.apache.tomcat.util.net.SSLHostConfig();
+tc_SSLHostConfig_22.setProtocols("TLSv1.1+TLSv1.2");
+tc_SSLHostConfig_22.setCertificateVerification("optionalNoCA");
+
tc_SSLHostConfig_22.setCertificateVerificationDepth(Integer.valueOf("3"));
+org.apache.tomcat.util.net.SSLHostConfigCert
(tomcat) branch 10.1.x updated: Add dedicated storeconfig test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 82bf6897b5 Add dedicated storeconfig test
82bf6897b5 is described below
commit 82bf6897b509f6ff20153e2745ad524297650036
Author: remm
AuthorDate: Thu Nov 14 14:20:18 2024 +0100
Add dedicated storeconfig test
---
.../catalina/storeconfig/TestStoreConfig.java | 147 +
1 file changed, 147 insertions(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
new file mode 100644
index 00..42fc8a5690
--- /dev/null
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -0,0 +1,147 @@
+/*
+ * 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.storeconfig;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Catalina;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.IOTools;
+import org.xml.sax.InputSource;
+
+public class TestStoreConfig extends TomcatBaseTest {
+
+@Test
+public void testListener() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+tomcat.enableNaming();
+StoreConfigLifecycleListener storeConfigListener = new
StoreConfigLifecycleListener();
+tomcat.getServer().addLifecycleListener(storeConfigListener);
+
+// Create various components (from generated embedded code; startup
errors must not be fatal)
+
+org.apache.catalina.deploy.NamingResourcesImpl
tc_NamingResourcesImpl_11 = new
org.apache.catalina.deploy.NamingResourcesImpl();
+org.apache.tomcat.util.descriptor.web.ContextResource
tc_ContextResource_12 = new
org.apache.tomcat.util.descriptor.web.ContextResource();
+tc_ContextResource_12.setName("UserDatabase");
+tc_ContextResource_12.setAuth("Container");
+tc_ContextResource_12.setType("org.apache.catalina.UserDatabase");
+tc_ContextResource_12.setDescription("User database that can be
updated and saved");
+tc_ContextResource_12.setProperty("factory",
"org.apache.catalina.users.MemoryUserDatabaseFactory");
+tc_ContextResource_12.setProperty("pathname", "conf/tomcat-users.xml");
+tc_NamingResourcesImpl_11.addResource(tc_ContextResource_12);
+tomcat.getServer().setGlobalNamingResources(tc_NamingResourcesImpl_11);
+
+org.apache.catalina.core.StandardThreadExecutor
tc_StandardThreadExecutor_14 = new
org.apache.catalina.core.StandardThreadExecutor();
+tc_StandardThreadExecutor_14.setName("tomcatThreadPool");
+tc_StandardThreadExecutor_14.setNamePrefix("catalina-exec-");
+tc_StandardThreadExecutor_14.setMaxThreads(Integer.valueOf("150"));
+tc_StandardThreadExecutor_14.setMinSpareThreads(Integer.valueOf("4"));
+tomcat.getService().addExecutor(tc_StandardThreadExecutor_14);
+
+org.apache.coyote.http2.Http2Protocol tc_Http2Protocol_17 = new
org.apache.coyote.http2.Http2Protocol();
+tomcat.getConnector().addUpgradeProtocol(tc_Http2Protocol_17);
+tomcat.getConnector().setProperty("SSLEnabled", "true");
+tomcat.getConnector().setScheme("https");
+tomcat.getConnector().setSecure(Boolean.valueOf("true"));
+tomcat.getConnector().setThrowOnFailure(false);
+
tomcat.getConnector().getProtocolHandler().setExecutor(tomcat.getService().getExecutor("tomcatThreadPool"));
+
+org.apache.tomcat.util.net.SSLHostConfig tc_SSLHostConfig_22 = new
org.apache.tomcat.util.net.SSLHostConfig();
+tc_SSLHostConfig_22.setProtocols("TLSv1.1+TLSv1.2");
+tc_SSLHostConfig_22.setCertificateVerification("optionalNoCA");
+
tc_SSLHostConfig_22.setCertificateVerificationDepth(Integer.valueOf("3"));
+org.apache.tomcat.util.net.SSLHostConfigCert
(tomcat) branch 9.0.x updated: Add dedicated storeconfig test
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 aaad624c31 Add dedicated storeconfig test
aaad624c31 is described below
commit aaad624c310e7da7dc25f12f214a1a074031de60
Author: remm
AuthorDate: Thu Nov 14 14:20:18 2024 +0100
Add dedicated storeconfig test
---
.../catalina/storeconfig/TestStoreConfig.java | 147 +
1 file changed, 147 insertions(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
new file mode 100644
index 00..42fc8a5690
--- /dev/null
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -0,0 +1,147 @@
+/*
+ * 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.storeconfig;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Catalina;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.IOTools;
+import org.xml.sax.InputSource;
+
+public class TestStoreConfig extends TomcatBaseTest {
+
+@Test
+public void testListener() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+tomcat.enableNaming();
+StoreConfigLifecycleListener storeConfigListener = new
StoreConfigLifecycleListener();
+tomcat.getServer().addLifecycleListener(storeConfigListener);
+
+// Create various components (from generated embedded code; startup
errors must not be fatal)
+
+org.apache.catalina.deploy.NamingResourcesImpl
tc_NamingResourcesImpl_11 = new
org.apache.catalina.deploy.NamingResourcesImpl();
+org.apache.tomcat.util.descriptor.web.ContextResource
tc_ContextResource_12 = new
org.apache.tomcat.util.descriptor.web.ContextResource();
+tc_ContextResource_12.setName("UserDatabase");
+tc_ContextResource_12.setAuth("Container");
+tc_ContextResource_12.setType("org.apache.catalina.UserDatabase");
+tc_ContextResource_12.setDescription("User database that can be
updated and saved");
+tc_ContextResource_12.setProperty("factory",
"org.apache.catalina.users.MemoryUserDatabaseFactory");
+tc_ContextResource_12.setProperty("pathname", "conf/tomcat-users.xml");
+tc_NamingResourcesImpl_11.addResource(tc_ContextResource_12);
+tomcat.getServer().setGlobalNamingResources(tc_NamingResourcesImpl_11);
+
+org.apache.catalina.core.StandardThreadExecutor
tc_StandardThreadExecutor_14 = new
org.apache.catalina.core.StandardThreadExecutor();
+tc_StandardThreadExecutor_14.setName("tomcatThreadPool");
+tc_StandardThreadExecutor_14.setNamePrefix("catalina-exec-");
+tc_StandardThreadExecutor_14.setMaxThreads(Integer.valueOf("150"));
+tc_StandardThreadExecutor_14.setMinSpareThreads(Integer.valueOf("4"));
+tomcat.getService().addExecutor(tc_StandardThreadExecutor_14);
+
+org.apache.coyote.http2.Http2Protocol tc_Http2Protocol_17 = new
org.apache.coyote.http2.Http2Protocol();
+tomcat.getConnector().addUpgradeProtocol(tc_Http2Protocol_17);
+tomcat.getConnector().setProperty("SSLEnabled", "true");
+tomcat.getConnector().setScheme("https");
+tomcat.getConnector().setSecure(Boolean.valueOf("true"));
+tomcat.getConnector().setThrowOnFailure(false);
+
tomcat.getConnector().getProtocolHandler().setExecutor(tomcat.getService().getExecutor("tomcatThreadPool"));
+
+org.apache.tomcat.util.net.SSLHostConfig tc_SSLHostConfig_22 = new
org.apache.tomcat.util.net.SSLHostConfig();
+tc_SSLHostConfig_22.setProtocols("TLSv1.1+TLSv1.2");
+tc_SSLHostConfig_22.setCertificateVerification("optionalNoCA");
+
tc_SSLHostConfig_22.setCertificateVerificationDepth(Integer.valueOf("3"));
+org.apache.tomcat.util.net.SSLHostConfigCertif
(tomcat) branch 10.1.x updated: Save protocols attributes for SSLHostConfig
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new dd55f42fae Save protocols attributes for SSLHostConfig
dd55f42fae is described below
commit dd55f42fae3f34c13c99d2ab039722c1a598739f
Author: remm
AuthorDate: Thu Nov 14 14:00:15 2024 +0100
Save protocols attributes for SSLHostConfig
---
.../catalina/storeconfig/SSLHostConfigSF.java | 38 ++
webapps/docs/changelog.xml | 4 +++
2 files changed, 42 insertions(+)
diff --git a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
index 44bad1d973..4fa6f06722 100644
--- a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
+++ b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
@@ -19,6 +19,8 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
import java.util.ArrayList;
+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.SSLHostConfigCertificate.Type;
@@ -29,6 +31,42 @@ import org.apache.tomcat.util.net.openssl.OpenSSLConf;
*/
public class SSLHostConfigSF extends StoreFactoryBase {
+private static Log log = LogFactory.getLog(SSLHostConfigSF.class);
+
+@Override
+public void store(PrintWriter aWriter, int indent, Object aElement) throws
Exception {
+StoreDescription elementDesc =
getRegistry().findDescription(aElement.getClass());
+if (elementDesc != null) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+}
+getStoreAppender().printIndent(aWriter, indent + 2);
+aWriter.print("<");
+aWriter.print(elementDesc.getTag());
+if (elementDesc.isAttributes() && aElement != null) {
+// Add protocols attribute
+SSLHostConfig bean2 = (SSLHostConfig)
getStoreAppender().defaultInstance(aElement);
+SSLHostConfig sslHostConfig = (SSLHostConfig) aElement;
+if
(!bean2.getProtocols().equals(sslHostConfig.getProtocols())) {
+StringBuffer protocolsValue = new StringBuffer();
+for (String protocol : sslHostConfig.getProtocols()) {
+protocolsValue.append('+').append(protocol);
+}
+getStoreAppender().printValue(aWriter, indent,
"protocols", protocolsValue.toString());
+}
+getStoreAppender().printAttributes(aWriter, indent, aElement,
elementDesc);
+}
+aWriter.println(">");
+storeChildren(aWriter, indent + 2, aElement, elementDesc);
+getStoreAppender().printIndent(aWriter, indent + 2);
+getStoreAppender().printCloseTag(aWriter, elementDesc);
+} else {
+if (log.isWarnEnabled()) {
+log.warn(sm.getString("factory.storeNoDescriptor",
aElement.getClass()));
+}
+}
+}
+
/**
* Store nested SSLHostConfigCertificate elements.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 53731feae2..241d2446f5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Add option to serve resources from subpath only with WebDAV Servlet
like
with DefaultServlet. (michaelo)
+
+Add special handling for the protocols attribute of
+SSLHostConfig in storeconfig. (remm)
+
-
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: Save protocols attributes for SSLHostConfig
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 ac174c490f Save protocols attributes for SSLHostConfig
ac174c490f is described below
commit ac174c490f002b0e766871a62a0326d311e04844
Author: remm
AuthorDate: Thu Nov 14 14:00:15 2024 +0100
Save protocols attributes for SSLHostConfig
---
.../catalina/storeconfig/SSLHostConfigSF.java | 38 ++
webapps/docs/changelog.xml | 4 +++
2 files changed, 42 insertions(+)
diff --git a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
index 44bad1d973..4fa6f06722 100644
--- a/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
+++ b/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
@@ -19,6 +19,8 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
import java.util.ArrayList;
+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.SSLHostConfigCertificate.Type;
@@ -29,6 +31,42 @@ import org.apache.tomcat.util.net.openssl.OpenSSLConf;
*/
public class SSLHostConfigSF extends StoreFactoryBase {
+private static Log log = LogFactory.getLog(SSLHostConfigSF.class);
+
+@Override
+public void store(PrintWriter aWriter, int indent, Object aElement) throws
Exception {
+StoreDescription elementDesc =
getRegistry().findDescription(aElement.getClass());
+if (elementDesc != null) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+}
+getStoreAppender().printIndent(aWriter, indent + 2);
+aWriter.print("<");
+aWriter.print(elementDesc.getTag());
+if (elementDesc.isAttributes() && aElement != null) {
+// Add protocols attribute
+SSLHostConfig bean2 = (SSLHostConfig)
getStoreAppender().defaultInstance(aElement);
+SSLHostConfig sslHostConfig = (SSLHostConfig) aElement;
+if
(!bean2.getProtocols().equals(sslHostConfig.getProtocols())) {
+StringBuffer protocolsValue = new StringBuffer();
+for (String protocol : sslHostConfig.getProtocols()) {
+protocolsValue.append('+').append(protocol);
+}
+getStoreAppender().printValue(aWriter, indent,
"protocols", protocolsValue.toString());
+}
+getStoreAppender().printAttributes(aWriter, indent, aElement,
elementDesc);
+}
+aWriter.println(">");
+storeChildren(aWriter, indent + 2, aElement, elementDesc);
+getStoreAppender().printIndent(aWriter, indent + 2);
+getStoreAppender().printCloseTag(aWriter, elementDesc);
+} else {
+if (log.isWarnEnabled()) {
+log.warn(sm.getString("factory.storeNoDescriptor",
aElement.getClass()));
+}
+}
+}
+
/**
* Store nested SSLHostConfigCertificate elements.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 921b590ddc..876b19846d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Add option to serve resources from subpath only with WebDAV Servlet
like
with DefaultServlet. (michaelo)
+
+Add special handling for the protocols attribute of
+SSLHostConfig in storeconfig. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add dedicated storeconfig test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 94b0b0de91 Add dedicated storeconfig test
94b0b0de91 is described below
commit 94b0b0de91ba3a1589bf4b5c247e6ac89dadc5a1
Author: remm
AuthorDate: Thu Nov 14 14:20:18 2024 +0100
Add dedicated storeconfig test
---
.../catalina/storeconfig/TestStoreConfig.java | 147 +
1 file changed, 147 insertions(+)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
new file mode 100644
index 00..42fc8a5690
--- /dev/null
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -0,0 +1,147 @@
+/*
+ * 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.storeconfig;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Catalina;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.IOTools;
+import org.xml.sax.InputSource;
+
+public class TestStoreConfig extends TomcatBaseTest {
+
+@Test
+public void testListener() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+tomcat.enableNaming();
+StoreConfigLifecycleListener storeConfigListener = new
StoreConfigLifecycleListener();
+tomcat.getServer().addLifecycleListener(storeConfigListener);
+
+// Create various components (from generated embedded code; startup
errors must not be fatal)
+
+org.apache.catalina.deploy.NamingResourcesImpl
tc_NamingResourcesImpl_11 = new
org.apache.catalina.deploy.NamingResourcesImpl();
+org.apache.tomcat.util.descriptor.web.ContextResource
tc_ContextResource_12 = new
org.apache.tomcat.util.descriptor.web.ContextResource();
+tc_ContextResource_12.setName("UserDatabase");
+tc_ContextResource_12.setAuth("Container");
+tc_ContextResource_12.setType("org.apache.catalina.UserDatabase");
+tc_ContextResource_12.setDescription("User database that can be
updated and saved");
+tc_ContextResource_12.setProperty("factory",
"org.apache.catalina.users.MemoryUserDatabaseFactory");
+tc_ContextResource_12.setProperty("pathname", "conf/tomcat-users.xml");
+tc_NamingResourcesImpl_11.addResource(tc_ContextResource_12);
+tomcat.getServer().setGlobalNamingResources(tc_NamingResourcesImpl_11);
+
+org.apache.catalina.core.StandardThreadExecutor
tc_StandardThreadExecutor_14 = new
org.apache.catalina.core.StandardThreadExecutor();
+tc_StandardThreadExecutor_14.setName("tomcatThreadPool");
+tc_StandardThreadExecutor_14.setNamePrefix("catalina-exec-");
+tc_StandardThreadExecutor_14.setMaxThreads(Integer.valueOf("150"));
+tc_StandardThreadExecutor_14.setMinSpareThreads(Integer.valueOf("4"));
+tomcat.getService().addExecutor(tc_StandardThreadExecutor_14);
+
+org.apache.coyote.http2.Http2Protocol tc_Http2Protocol_17 = new
org.apache.coyote.http2.Http2Protocol();
+tomcat.getConnector().addUpgradeProtocol(tc_Http2Protocol_17);
+tomcat.getConnector().setProperty("SSLEnabled", "true");
+tomcat.getConnector().setScheme("https");
+tomcat.getConnector().setSecure(Boolean.valueOf("true"));
+tomcat.getConnector().setThrowOnFailure(false);
+
tomcat.getConnector().getProtocolHandler().setExecutor(tomcat.getService().getExecutor("tomcatThreadPool"));
+
+org.apache.tomcat.util.net.SSLHostConfig tc_SSLHostConfig_22 = new
org.apache.tomcat.util.net.SSLHostConfig();
+tc_SSLHostConfig_22.setProtocols("TLSv1.1+TLSv1.2");
+tc_SSLHostConfig_22.setCertificateVerification("optionalNoCA");
+
tc_SSLHostConfig_22.setCertificateVerificationDepth(Integer.valueOf("3"));
+org.apache.tomcat.util.net.SSLHostConfigCertific
Buildbot failure in on tomcat-12.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/120/builds/204 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 94b0b0de91ba3a1589bf4b5c247e6ac89dadc5a1 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
