Issue building tomcat 8.5.56
Hi!, I'm able to checkout 8.5.56 tag and have a successful: ant But I'm getting the following errors [1] after running: ant test I notice that in the build.properties.default there are some Build control flags [2] related for NIO and NIO2, but by checking the Travis file I don't see those flags are been set to false during CI runs [3] It seems that during Travis build the project https://github.com/apache/tomcat-native is also compiled [4] but I wonder if I actually need to compile this tomcat-native or if there is something else I'm missing that is preventing me to have a successful build with all tests passing ok? My environment: - OSX 10.15.5 - java version "1.7.0_79" Java(TM) SE Runtime Environment (build 1.7.0_79-b15) Java HotSpot(TM) 64-Bit Server VM (build 24.79-b02, mixed mode) - javac 1.7.0_79 - Apache Ant(TM) version 1.9.9 compiled on February 2 2017 - Git TAG checkout 8.5.56: https://github.com/apache/tomcat/tree/4560d2f5a49965f73ed07cb879f17d9c096c9d13 [1] [concat] Testsuites with failed tests: [concat] TEST-org.apache.catalina.loader.TestPermissions.NIO.txt [concat] TEST-org.apache.catalina.loader.TestPermissions.NIO2.txt [concat] TEST-org.apache.catalina.session.TestStandardSessionIntegration.NIO.txt [concat] TEST-org.apache.catalina.session.TestStandardSessionIntegration.NIO2.txt [concat] TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO.txt [concat] TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO2.txt [concat] TEST-org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO.txt [concat] TEST-org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO2.txt [concat] TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO.txt [concat] TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO2.txt [concat] TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO.txt [concat] TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO2.txt [concat] TEST-org.apache.coyote.http11.TestHttp11Processor.NIO.txt [concat] TEST-org.apache.coyote.http11.TestHttp11Processor.NIO2.txt [concat] TEST-org.apache.coyote.http2.TestHttp2Section_5_3.NIO.txt [concat] TEST-org.apache.tomcat.util.digester.TestDigesterPermissions.NIO.txt [concat] TEST-org.apache.tomcat.util.digester.TestDigesterPermissions.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.TestSsl.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestSsl.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt [concat] TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO.txt [concat] TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO2.txt [concat] TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.NIO.txt [concat] TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.NIO2.txt [concat] TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.NIO.txt [concat] TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.NIO2.txt [2] execute.test.nio=true execute.test.nio2=true [3] https://github.com/apache/tomcat/blob/4560d2f5a49965f73ed07cb879f17d9c096c9d13/.travis.yml [4] https://github.com/apache/tomcat/blob/4560d2f5a49965f73ed07cb879f17d9c096c9d13/.travis.yml#L57 -- Atentamente: César Hernández.
[tomcat] branch 9.0.x updated: Fix path
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 47d7674 Fix path 47d7674 is described below commit 47d76745c3cf84ab2bbf031a174833ce80861e3f Author: remm AuthorDate: Mon Jun 29 22:44:28 2020 +0200 Fix path --- webapps/docs/graal.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/graal.xml b/webapps/docs/graal.xml index 442ba22..694ecab 100644 --- a/webapps/docs/graal.xml +++ b/webapps/docs/graal.xml @@ -64,9 +64,9 @@ cd $JAVA_HOME/bin ./gu install native-image Mandrel already includes the Native Image tool ready to use, so this - step can be skipped. Only JAVA_HOME must be set to the mandrelJDK folder, - such as: - export JAVA_HOME=/absolute...path...to/mandrel-javaXX-platform-x.x.x.x + step can be skipped. Only JAVA_HOME must be set to the folder which + contains the bin folder with the JVM binaries, such as: + export JAVA_HOME=/absolute...path...to/mandrel-javaXX-platform-x.x.x.x/mandrelJDK - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix path
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 19c191e Fix path 19c191e is described below commit 19c191ea029089c62ece640de27adb2fa18d5769 Author: remm AuthorDate: Mon Jun 29 22:44:28 2020 +0200 Fix path --- webapps/docs/graal.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/graal.xml b/webapps/docs/graal.xml index b89dc1d..aaafbd2 100644 --- a/webapps/docs/graal.xml +++ b/webapps/docs/graal.xml @@ -64,9 +64,9 @@ cd $JAVA_HOME/bin ./gu install native-image Mandrel already includes the Native Image tool ready to use, so this - step can be skipped. Only JAVA_HOME must be set to the mandrelJDK folder, - such as: - export JAVA_HOME=/absolute...path...to/mandrel-javaXX-platform-x.x.x.x + step can be skipped. Only JAVA_HOME must be set to the folder which + contains the bin folder with the JVM binaries, such as: + export JAVA_HOME=/absolute...path...to/mandrel-javaXX-platform-x.x.x.x/mandrelJDK - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64560] DeltaSession discards pending deltas when changeSessionId() is called
https://bz.apache.org/bugzilla/show_bug.cgi?id=64560 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas --- Thanks for the report and for tracking down what was going on. I agree with your assessment. I have refactored the setId() methods. Fixed in: - master for 10.0.0-M7 onwards - 9.0.x for 9.0.37 onwards - 8.5.x for 8.5.57 onwards - 7.0.x for 7.0.105 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix BZ 64560 Don't clear DeltaRequest when changing session ID
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 22da96f Fix BZ 64560 Don't clear DeltaRequest when changing session ID
22da96f is described below
commit 22da96f9f99c9307c09f5c32d6095c08fb2f6028
Author: Mark Thomas
AuthorDate: Mon Jun 29 21:21:30 2020 +0100
Fix BZ 64560 Don't clear DeltaRequest when changing session ID
The calls to DeltaSession.setID() are either from creating a new session
(in which case the DeltaRequest does not need to be reset) or from
changing the session ID in which pending changes should be retained.
---
java/org/apache/catalina/ha/session/DeltaSession.java | 10 +++---
webapps/docs/changelog.xml| 9 +
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 25b895c..b14b11a 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -333,7 +333,12 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
@Override
public void setId(String id, boolean notify) {
super.setId(id, notify);
-resetDeltaRequest();
+lockInternal();
+try {
+deltaRequest.setSessionId(getIdInternal());
+} finally{
+unlockInternal();
+}
}
@@ -345,8 +350,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
*/
@Override
public void setId(String id) {
-super.setId(id, true);
-resetDeltaRequest();
+setId(id, true);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 473ae00..4ac430d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,15 @@
+
+
+
+64560: Refactor the replication of a changed session ID for
a
+replicated session so that the list of changes associated with the
+session is not reset when the session ID changes. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix BZ 64560 Don't clear DeltaRequest when changing session ID
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 64781c1 Fix BZ 64560 Don't clear DeltaRequest when changing session ID
64781c1 is described below
commit 64781c1311e108acbcc64031c690de1c2fe300ce
Author: Mark Thomas
AuthorDate: Mon Jun 29 21:21:30 2020 +0100
Fix BZ 64560 Don't clear DeltaRequest when changing session ID
The calls to DeltaSession.setID() are either from creating a new session
(in which case the DeltaRequest does not need to be reset) or from
changing the session ID in which pending changes should be retained.
---
java/org/apache/catalina/ha/session/DeltaSession.java | 10 +++---
webapps/docs/changelog.xml| 9 +
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index ae52301..3e4eb8f 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -325,7 +325,12 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
@Override
public void setId(String id, boolean notify) {
super.setId(id, notify);
-resetDeltaRequest();
+lockInternal();
+try {
+deltaRequest.setSessionId(getIdInternal());
+} finally{
+unlockInternal();
+}
}
@@ -337,8 +342,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
*/
@Override
public void setId(String id) {
-super.setId(id, true);
-resetDeltaRequest();
+setId(id, true);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b1fec98..c92a982 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,15 @@
+
+
+
+64560: Refactor the replication of a changed session ID for
a
+replicated session so that the list of changes associated with the
+session is not reset when the session ID changes. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 64560 Don't clear DeltaRequest when changing session ID
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 61d5239 Fix BZ 64560 Don't clear DeltaRequest when changing session ID
61d5239 is described below
commit 61d52391532b01d11870fe91db37a360a1c899d4
Author: Mark Thomas
AuthorDate: Mon Jun 29 21:21:30 2020 +0100
Fix BZ 64560 Don't clear DeltaRequest when changing session ID
The calls to DeltaSession.setID() are either from creating a new session
(in which case the DeltaRequest does not need to be reset) or from
changing the session ID in which pending changes should be retained.
---
java/org/apache/catalina/ha/session/DeltaSession.java | 10 +++---
webapps/docs/changelog.xml| 9 +
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index ae52301..3e4eb8f 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -325,7 +325,12 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
@Override
public void setId(String id, boolean notify) {
super.setId(id, notify);
-resetDeltaRequest();
+lockInternal();
+try {
+deltaRequest.setSessionId(getIdInternal());
+} finally{
+unlockInternal();
+}
}
@@ -337,8 +342,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
*/
@Override
public void setId(String id) {
-super.setId(id, true);
-resetDeltaRequest();
+setId(id, true);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 07394e4..ac97228 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,6 +118,15 @@
+
+
+
+64560: Refactor the replication of a changed session ID for
a
+replicated session so that the list of changes associated with the
+session is not reset when the session ID changes. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64560 Don't clear DeltaRequest when changing session ID
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d98748d Fix BZ 64560 Don't clear DeltaRequest when changing session ID
d98748d is described below
commit d98748d725edda58546413e809fc8e70048354e0
Author: Mark Thomas
AuthorDate: Mon Jun 29 21:21:30 2020 +0100
Fix BZ 64560 Don't clear DeltaRequest when changing session ID
The calls to DeltaSession.setID() are either from creating a new session
(in which case the DeltaRequest does not need to be reset) or from
changing the session ID in which pending changes should be retained.
---
java/org/apache/catalina/ha/session/DeltaSession.java | 10 +++---
webapps/docs/changelog.xml| 9 +
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 8d0e6c2..8d0f8e1 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -325,7 +325,12 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
@Override
public void setId(String id, boolean notify) {
super.setId(id, notify);
-resetDeltaRequest();
+lockInternal();
+try {
+deltaRequest.setSessionId(getIdInternal());
+} finally{
+unlockInternal();
+}
}
@@ -337,8 +342,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
*/
@Override
public void setId(String id) {
-super.setId(id, true);
-resetDeltaRequest();
+setId(id, true);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c95c1ec..c5708d3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,15 @@
+
+
+
+64560: Refactor the replication of a changed session ID for
a
+replicated session so that the list of changes associated with the
+session is not reset when the session ID changes. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64541] Parsing of mbeans-descriptor.xml files throw errors on server startup
https://bz.apache.org/bugzilla/show_bug.cgi?id=64541 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #11 from Mark Thomas --- I went with the option of manually expanding the entities. There weren't that many. Fixed in: - master for 10.0.0-M7 onwards - 9.0.x for 9.0.37 onwards - 8.5.x for 8.5.57 onwards - 7.0.x for 7.0.105 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix BZ 64541 Refactor DTD
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 8747b9c Fix BZ 64541 Refactor DTD 8747b9c is described below commit 8747b9cd11b271d12b89719cd79026d3542d63e3 Author: Mark Thomas AuthorDate: Mon Jun 29 17:49:36 2020 +0100 Fix BZ 64541 Refactor DTD Refactoring removes use of entities to avoid errors when XML entity expansion is disabled --- .../tomcat/util/modeler/mbeans-descriptors.dtd | 80 +++--- webapps/docs/changelog.xml | 5 ++ 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index 14daed5..dc9fe59 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -30,7 +30,9 @@ - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - - - + + + @@ -176,13 +178,13 @@ managed resource implementation class. --> - - - - - - - + + + + + + + - - - + + + - + - - - - - + + + + + - - - - - - + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0230a60..473ae00 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -70,6 +70,11 @@ Add application/wasm to the media types recognised by Tomcat. Based on a PR by Thiago Henrique Hüpner. (markt) + +64541: Refactor the DTD used to validate +mbeans-descriptors.xml files to avoid issues when XML +entity expansion is limited or disabled. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix BZ 64541 Refactor DTD
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 672dc51 Fix BZ 64541 Refactor DTD 672dc51 is described below commit 672dc5131e45de2e2b4939179b2718ed593b0d42 Author: Mark Thomas AuthorDate: Mon Jun 29 17:49:36 2020 +0100 Fix BZ 64541 Refactor DTD Refactoring removes use of entities to avoid errors when XML entity expansion is disabled --- .../tomcat/util/modeler/mbeans-descriptors.dtd | 80 +++--- webapps/docs/changelog.xml | 5 ++ 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index f12b8fe..28c4d12 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -30,7 +30,9 @@ - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - - - + + + @@ -176,13 +178,13 @@ managed resource implementation class. --> - - - - - - - + + + + + + + - - - + + + - + - - - - - + + + + + - - - - - - + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a46bbca..b1fec98 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -72,6 +72,11 @@ implement the requested method rather than the more general 400 response. (markt) + +64541: Refactor the DTD used to validate +mbeans-descriptors.xml files to avoid issues when XML +entity expansion is limited or disabled. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 64541 Refactor DTD
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new c401927 Fix BZ 64541 Refactor DTD c401927 is described below commit c4019272db6eb0712b0e0ff1531648094e575d54 Author: Mark Thomas AuthorDate: Mon Jun 29 17:49:36 2020 +0100 Fix BZ 64541 Refactor DTD Refactoring removes use of entities to avoid errors when XML entity expansion is disabled --- .../tomcat/util/modeler/mbeans-descriptors.dtd | 80 +++--- webapps/docs/changelog.xml | 5 ++ 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index f12b8fe..28c4d12 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -30,7 +30,9 @@ - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - - - + + + @@ -176,13 +178,13 @@ managed resource implementation class. --> - - - - - - - + + + + + + + - - - + + + - + - - - - - + + + + + - - - - - - + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 086e79f..07394e4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -76,6 +76,11 @@ Add generated classes using Tomcat embedded as an optional replacement for the Catalina configuration files. (remm) + +64541: Refactor the DTD used to validate +mbeans-descriptors.xml files to avoid issues when XML +entity expansion is limited or disabled. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64541 Refactor DTD
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new a003a7a Fix BZ 64541 Refactor DTD a003a7a is described below commit a003a7ab9086d12ca91f5e7c328daf9e813cbe91 Author: Mark Thomas AuthorDate: Mon Jun 29 17:49:36 2020 +0100 Fix BZ 64541 Refactor DTD Refactoring removes use of entities to avoid errors when XML entity expansion is disabled --- .../tomcat/util/modeler/mbeans-descriptors.dtd | 80 +++--- webapps/docs/changelog.xml | 5 ++ 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index f12b8fe..28c4d12 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -30,7 +30,9 @@ - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - - - + + + @@ -176,13 +178,13 @@ managed resource implementation class. --> - - - - - - - + + + + + + + - - - + + + - + - - - - - + + + + + - - - - - - + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 46f9def..c95c1ec 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -79,6 +79,11 @@ Add generated classes using Tomcat embedded as an optional replacement for the Catalina configuration files. (remm) + +64541: Refactor the DTD used to validate +mbeans-descriptors.xml files to avoid issues when XML +entity expansion is limited or disabled. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Announcing ApacheCon @Home 2020
Hi, Apache enthusiast! (You’re receiving this because you’re subscribed to one or more dev or user mailing lists for an Apache Software Foundation project.) The ApacheCon Planners and the Apache Software Foundation are pleased to announce that ApacheCon @Home will be held online, September 29th through October 1st, 2020. We’ll be featuring content from dozens of our projects, as well as content about community, how Apache works, business models around Apache software, the legal aspects of open source, and many other topics. Full details about the event, and registration, is available at https://apachecon.com/acah2020 Due to the confusion around how and where this event was going to be held, and in order to open up to presenters from around the world who may previously have been unable or unwilling to travel, we’ve reopened the Call For Presentations until July 13th. Submit your talks today at https://acna2020.jamhosted.net/ We hope to see you at the event! Rich Bowen, VP Conferences, The Apache Software Foundation - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5278 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 483e2ec1d613f46c3ac8757d8dfa7c056fb65d72 Blamelist: Martin Tzvetanov Grigorov Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5277 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] c455eb914d9ca98e74d2e2d1acca0a60245d16a8 Blamelist: Martin Grigorov ,Raymond Augé BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on pull request #309: Allow recursive substitution of properties.
martin-g commented on pull request #309: URL: https://github.com/apache/tomcat/pull/309#issuecomment-651073064 New test case(s) in https://github.com/apache/tomcat/blob/master/test/org/apache/tomcat/util/TestIntrospectionUtils.java would be good to be added! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix a typo in 'namespace' word
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 483e2ec Fix a typo in 'namespace' word 483e2ec is described below commit 483e2ec1d613f46c3ac8757d8dfa7c056fb65d72 Author: Martin Tzvetanov Grigorov AuthorDate: Mon Jun 29 14:54:01 2020 +0300 Fix a typo in 'namespace' word --- modules/stuffed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stuffed/README.md b/modules/stuffed/README.md index 7e50576..16bba25 100644 --- a/modules/stuffed/README.md +++ b/modules/stuffed/README.md @@ -39,7 +39,7 @@ mvn clean; mvn package ``` docker build -t apache/tomcat-stuffed:1.0 -f ./Dockerfile . ``` -Docker build arguments include `namepsace` (default is `tomcat`) and `port` which should match the Tomcat port in `server.xml` (default is `8080`). Other ports that need to be exposed can be added in the `Dockerfile` as needed. Webapps should be added to the `webapps` folder where they will be auto deployed by the host if using the defaults. Otherwise, the `Dockerfile` command line can be edited like below to include the necesary resources and command line arguments to run a single or mu [...] +Docker build arguments include `namespace` (default is `tomcat`) and `port` which should match the Tomcat port in `server.xml` (default is `8080`). Other ports that need to be exposed can be added in the `Dockerfile` as needed. Webapps should be added to the `webapps` folder where they will be auto deployed by the host if using the defaults. Otherwise, the `Dockerfile` command line can be edited like below to include the necesary resources and command line arguments to run a single or mu [...] ## Running - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: github actions
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 6bd2935 github actions
new c455eb9 Merge pull request #307 from rotty3000/github.actions
6bd2935 is described below
commit 6bd2935e85d4ee3b815eddc321d403bc8489858e
Author: Raymond Augé
AuthorDate: Tue Jun 23 15:26:44 2020 -0400
github actions
Signed-off-by: Raymond Augé
---
.github/workflows/ci.yml | 49
build.xml| 4 +---
2 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000..a9f217a
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,49 @@
+#Licensed 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.
+
+name: Smoke Test
+
+on:
+ push:
+branches:
+ - master
+ pull_request:
+branches:
+ - master
+
+env:
+ LC_ALL: en_US.UTF-8
+
+jobs:
+ JDKxx_Matrix:
+strategy:
+ fail-fast: false
+ matrix:
+java: [ 8, 11, 14, 15-ea ]
+os: [ ubuntu-latest ]
+include:
+- os: windows-latest
+ java: 8
+name: JDK${{ matrix.java }} ${{ matrix.os }}
+runs-on: ${{ matrix.os }}
+steps:
+- name: Git Checkout
+ uses: actions/checkout@v2
+- name: Set up Java
+ uses: actions/setup-java@v1
+ with:
+java-version: ${{ matrix.java }}
+- name: Build
+ run: |
+ant -noinput echoproperties deploy embed test-nio test-status
+ env:
+ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true
-Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap
[...]
\ No newline at end of file
diff --git a/build.xml b/build.xml
index b1b4fe6..e312594 100644
--- a/build.xml
+++ b/build.xml
@@ -1678,7 +1678,7 @@
/>
-
+
@@ -1689,8 +1689,6 @@
-
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g merged pull request #307: github actions
martin-g merged pull request #307: URL: https://github.com/apache/tomcat/pull/307 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64563] Special payload length of websocket frame leads to high CPU usage
https://bz.apache.org/bugzilla/show_bug.cgi?id=64563 niuhaili...@huawei.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |CLOSED -- 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
[GitHub] [tomcat] FSchumacher commented on a change in pull request #309: Allow recursive substitution of properties.
FSchumacher commented on a change in pull request #309:
URL: https://github.com/apache/tomcat/pull/309#discussion_r446874481
##
File path: java/org/apache/tomcat/util/IntrospectionUtils.java
##
@@ -332,7 +341,15 @@ public static String replaceProperties(String value,
}
if (prev < value.length())
sb.append(value.substring(prev));
-return sb.toString();
+String newval = sb.toString();
+if (newval.indexOf('$') < 0) {
+return newval;
+}
+if (newval.equals(value))
+return value;
+if (log.isDebugEnabled())
+log.debug("IntrospectionUtils.replaceProperties iter on: " +
newval);
+return replaceProperties(newval, staticProp, dynamicProp, classLoader,
iterationCount+1);
Review comment:
I would stay with the recursion here, as it is doesn't seem to be time
critical to replace those placeholders and I find it easier to read with the
recursion.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] FSchumacher commented on a change in pull request #309: Allow recursive substitution of properties.
FSchumacher commented on a change in pull request #309:
URL: https://github.com/apache/tomcat/pull/309#discussion_r446873594
##
File path: java/org/apache/tomcat/util/IntrospectionUtils.java
##
@@ -332,7 +341,15 @@ public static String replaceProperties(String value,
}
if (prev < value.length())
sb.append(value.substring(prev));
-return sb.toString();
+String newval = sb.toString();
+if (newval.indexOf('$') < 0) {
Review comment:
I think the first variant is the way to go. We even have tests, that
check, if `abc${normal}xyz` gets replaced.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
