Re: [tomcat] branch 8.5.x updated: Update to JSign 4.0 to remove dependency on client tools.
On 17/08/2021 22:38, ma...@apache.org wrote: 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 7e7dbac Update to JSign 4.0 to remove dependency on client tools. Probably one for Emmanuel. I'm trying to do a release build from 8.5.x with 1.7.0_80_x64 (Oracle) and I am getting the following error below on signing. Any hints on how to fix this? Thanks, Mark C:\asf-tomcat\build.xml:2295: Couldn't sign C:\asf-tomcat\output\dist\Uninstall.exe at net.jsign.JsignTask.execute(JsignTask.java:183) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:293) at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106) at org.apache.tools.ant.Task.perform(Task.java:352) at org.apache.tools.ant.Target.execute(Target.java:437) at org.apache.tools.ant.Target.performTasks(Target.java:458) at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1406) at org.apache.tools.ant.Project.executeTarget(Project.java:1377) at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41) at org.apache.tools.ant.Project.executeTargets(Project.java:1261) at org.apache.tools.ant.Main.runBuild(Main.java:857) at org.apache.tools.ant.Main.startAnt(Main.java:236) at org.apache.tools.ant.launch.Launcher.run(Launcher.java:287) at org.apache.tools.ant.launch.Launcher.main(Launcher.java:112) Caused by: net.jsign.SignerException: Couldn't sign C:\asf-tomcat\output\dist\Uninstall.exe at net.jsign.SignerHelper.sign(SignerHelper.java:517) at net.jsign.JsignTask.execute(JsignTask.java:181) ... 16 more Caused by: net.jsign.bouncycastle.operator.RuntimeOperatorException: exception obtaining signature: java.security.GeneralSecurityException: javax.net.ssl.SSLHandshakeException: Received fatal alert: handshake_failure at net.jsign.bouncycastle.operator.jcajce.JcaContentSignerBuilder$1.getSignature(Unknown Source) at net.jsign.bouncycastle.cms.SignerInfoGenerator.generate(Unknown Source) at net.jsign.bouncycastle.cms.CMSSignedDataGenerator.generate(Unknown Source) at net.jsign.bouncycastle.cms.CMSSignedDataGenerator.generate(Unknown Source) at net.jsign.asn1.authenticode.AuthenticodeSignedDataGenerator.generate(AuthenticodeSignedDataGenerator.java:50) at net.jsign.AuthenticodeSigner.createSignedData(AuthenticodeSigner.java:363) at net.jsign.AuthenticodeSigner.sign(AuthenticodeSigner.java:334) at net.jsign.SignerHelper.sign(SignerHelper.java:509) ... 17 more Caused by: java.security.SignatureException: java.security.GeneralSecurityException: javax.net.ssl.SSLHandshakeException: Received fatal alert: handshake_failure at net.jsign.jca.SigningServiceSignature.engineSign(SigningServiceSignature.java:64) at java.security.Signature$Delegate.engineSign(Signature.java:1205) at java.security.Signature.sign(Signature.java:578) ... 25 more Caused by: java.security.GeneralSecurityException: javax.net.ssl.SSLHandshakeException: Received fatal alert: handshake_failure at net.jsign.jca.DigiCertOneSigningService.sign(DigiCertOneSigningService.java:207) at net.jsign.jca.SigningServiceSignature.engineSign(SigningServiceSignature.java:62) ... 27 more Caused by: javax.net.ssl.SSLHandshakeException: Received fatal alert: handshake_failure at sun.security.ssl.Alerts.getSSLException(Alerts.java:192) at sun.security.ssl.Alerts.getSSLException(Alerts.java:154) at sun.security.ssl.SSLSocketImpl.recvAlert(SSLSocketImpl.java:1979) at sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:1086) at sun.security.ssl.SSLSocketImpl.performInitialHandshake(SSLSocketImpl.java:1332) at sun.security.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1359) at sun.security.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1343) at sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:559) at sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:185) at sun.net.www.protocol.http.HttpURLConnection.getOutputStream(HttpURLConnection.java:1092) at sun.net.www.protocol.https.HttpsURLConnectionImpl.getOutputStream(HttpsURLConnectionImpl.java:250) at net.jsign.jca.RESTClient.query(RESTClient.java:62) at
[tomcat] branch 8.5.x updated: Update to JSign 4.0 to remove dependency on client tools.
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 7e7dbac Update to JSign 4.0 to remove dependency on client tools.
7e7dbac is described below
commit 7e7dbacc1d66cf4d50af3a4e77ee9e8509b51c0d
Author: Mark Thomas
AuthorDate: Tue Aug 17 20:37:01 2021 +0100
Update to JSign 4.0 to remove dependency on client tools.
---
build.properties.default | 13 +++--
build.xml | 16 +++-
webapps/docs/changelog.xml | 4
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0a17af9..adb76cf 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -78,9 +78,10 @@ gpg.exec=/path/to/gpg
# Code signing of Windows installer
# See https://infra.apache.org/digicert-use.html for setup instructions
do.codesigning=false
-codesigning.pkcs11properties=${user.home}/.digicertone/pkcs11properties.cfg
-codesigning.alias=Tomcat-PMC-key-2021-04
+codesigning.alias=Tomcat-PMC-cert-2021-04
codesigning.digest=SHA-512
+codesigning.storetype=DIGICERTONE
+codesigning.storepass=set-this-in-build.properties
# - Settings to use when downloading files -
trydownload.httpusecaches=true
@@ -297,15 +298,15 @@ findbugs.home=${base.path}/spotbugs-${findbugs.version}
findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
-# - JSign, version 3.1 -
+# - JSign, version 4.0 -
# JSign 3.0 onwards requires Java 8 by default
# Use Java 7 build
-jsign.version=3.1
+jsign.version=4.0
-# checksums for JSign 3.1
+# checksums for JSign 4.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=SHA-512
-jsign.checksum.value=481a6e7276688363106ee3492da52807577822b8114b13804df796cd143f479a50d0864215f63b9bb8120a85b2f6185b2845974872d11ff070407dd01879bb0e
+jsign.checksum.value=14e4de1755df3a616ef2725f54542a532c7b86d6fdbc214e34c554068471e74f348eeafebf3074afcbec53786e5b3219de61cb52ad9b01120f03c304a4e9
jsign.home=${base.path}/jsign-${jsign.version}-java7
jsign.jar=${jsign.home}/jsign-${jsign.version}-java7.jar
diff --git a/build.xml b/build.xml
index d30526a..15c8fb8 100644
--- a/build.xml
+++ b/build.xml
@@ -2288,9 +2288,8 @@ skip.installer property in build.properties" />
unless="skip.installer"
depends="-installer-create-uninstaller,setup-jsign"
if="${do.codesigning}">
http://timestamp.digicert.com"/>
@@ -2317,12 +2316,11 @@ skip.installer property in build.properties" />
description="Builds and optionally signs the Windows installer"
depends="-installer,setup-jsign" if="${do.codesigning}" >
http://timestamp.digicert.com"/>
+ storepass="${codesigning.storepass}"
+ storetype="${codesigning.storetype}"
+ alias="${codesigning.alias}"
+ alg="${codesigning.digest}"
+ tsaurl="http://timestamp.digicert.com"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2fa5c43..9666a16 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,10 @@
Fix failing build when building on non-English locales. Pull request
441 provided by Dachuan J. (markt)
+
+Update to JSign version 4.0 to enable code signing without the need for
+the installation of additional client tools. (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: Update to JSign 4.0 to remove dependency on client tools.
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 396eea5 Update to JSign 4.0 to remove dependency on client tools.
396eea5 is described below
commit 396eea5bb15537bc183eea006a0040c02fd2e739
Author: Mark Thomas
AuthorDate: Tue Aug 17 20:37:01 2021 +0100
Update to JSign 4.0 to remove dependency on client tools.
---
build.properties.default | 13 +++--
build.xml | 16 +++-
webapps/docs/changelog.xml | 4
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 71cb1c8..c22e58b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -79,9 +79,10 @@ gpg.exec=/path/to/gpg
# Code signing of Windows installer
# See https://infra.apache.org/digicert-use.html for setup instructions
do.codesigning=false
-codesigning.pkcs11properties=${user.home}/.digicertone/pkcs11properties.cfg
-codesigning.alias=Tomcat-PMC-key-2021-04
+codesigning.alias=Tomcat-PMC-cert-2021-04
codesigning.digest=SHA-512
+codesigning.storetype=DIGICERTONE
+codesigning.storepass=set-this-in-build.properties
# - Settings to use when downloading files -
trydownload.httpusecaches=true
@@ -311,13 +312,13 @@
osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-# - JSign, version 3.1 or later -
-jsign.version=3.1
+# - JSign, version 4.0 or later -
+jsign.version=4.0
-# checksums for JSign 3.1
+# checksums for JSign 4.0
jsign.checksum.enable=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ed924fc86b7abe1dfe22fd8fd7e4c417|5736035f64805b2760a41ebc1ff11523f666f2c7
+jsign.checksum.value=50982facf864df4f08a051b43f7d2e42|3d203fbffdc45e837f98b7c9c5d311b615661a75
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/build.xml b/build.xml
index 1aef121..17c357d 100644
--- a/build.xml
+++ b/build.xml
@@ -2607,9 +2607,8 @@ skip.installer property in build.properties" />
unless="skip.installer"
depends="-installer-create-uninstaller,setup-jsign"
if="${do.codesigning}">
http://timestamp.digicert.com"/>
@@ -2636,12 +2635,11 @@ skip.installer property in build.properties" />
description="Builds and optionally signs the Windows installer"
depends="-installer,setup-jsign" if="${do.codesigning}" >
http://timestamp.digicert.com"/>
+ storepass="${codesigning.storepass}"
+ storetype="${codesigning.storetype}"
+ alias="${codesigning.alias}"
+ alg="${codesigning.digest}"
+ tsaurl="http://timestamp.digicert.com"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3025d8a..204fe7f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,10 @@
Fix failing build when building on non-English locales. Pull request
441 provided by Dachuan J. (markt)
+
+Update to JSign version 4.0 to enable code signing without the need for
+the installation of additional client tools. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update to JSign 4.0 to remove dependency on client tools.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 43dcb9e Update to JSign 4.0 to remove dependency on client tools.
43dcb9e is described below
commit 43dcb9ec5fc6f5266846c600dca727638dff6699
Author: Mark Thomas
AuthorDate: Tue Aug 17 20:37:01 2021 +0100
Update to JSign 4.0 to remove dependency on client tools.
---
build.properties.default | 13 +++--
build.xml | 16 +++-
webapps/docs/changelog.xml | 4
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index cac92e1..f9f3bda 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -79,9 +79,10 @@ gpg.exec=/path/to/gpg
# Code signing of Windows installer
# See https://infra.apache.org/digicert-use.html for setup instructions
do.codesigning=false
-codesigning.pkcs11properties=${user.home}/.digicertone/pkcs11properties.cfg
-codesigning.alias=Tomcat-PMC-key-2021-04
+codesigning.alias=Tomcat-PMC-cert-2021-04
codesigning.digest=SHA-512
+codesigning.storetype=DIGICERTONE
+codesigning.storepass=set-this-in-build.properties
# - Settings to use when downloading files -
trydownload.httpusecaches=true
@@ -323,13 +324,13 @@
migration-lib.home=${base.path}/migration-${migration-lib.version}
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
-# - JSign, version 3.1 or later -
-jsign.version=3.1
+# - JSign, version 4.0 or later -
+jsign.version=4.0
-# checksums for JSign 3.1
+# checksums for JSign 4.0
jsign.checksum.enable=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ed924fc86b7abe1dfe22fd8fd7e4c417|5736035f64805b2760a41ebc1ff11523f666f2c7
+jsign.checksum.value=50982facf864df4f08a051b43f7d2e42|3d203fbffdc45e837f98b7c9c5d311b615661a75
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/build.xml b/build.xml
index 1ce3b7f..b3a6a7b 100644
--- a/build.xml
+++ b/build.xml
@@ -2625,9 +2625,8 @@ skip.installer property in build.properties" />
unless="skip.installer"
depends="-installer-create-uninstaller,setup-jsign"
if="${do.codesigning}">
http://timestamp.digicert.com"/>
@@ -2654,12 +2653,11 @@ skip.installer property in build.properties" />
description="Builds and optionally signs the Windows installer"
depends="-installer,setup-jsign" if="${do.codesigning}" >
http://timestamp.digicert.com"/>
+ storepass="${codesigning.storepass}"
+ storetype="${codesigning.storetype}"
+ alias="${codesigning.alias}"
+ alg="${codesigning.digest}"
+ tsaurl="http://timestamp.digicert.com"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4a24838..1c31290 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,10 @@
Fix failing build when building on non-English locales. Pull request
441 provided by Dachuan J. (markt)
+
+Update to JSign version 4.0 to enable code signing without the need for
+the installation of additional client tools. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Update to JSign 4.0 to remove dependency on client tools.
On 17/08/2021 21:08, ma...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. markt 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 16c684b Update to JSign 4.0 to remove dependency on client tools. Woot! Once I managed to get wine working correctly on MacOS, I was able to build a complete 10.1.x release - including signed installer for Windows - on MacOS. :) Wine on MacOs steps have been added to the wiki. I'll backport the JSign 4 updates shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update to JSign 4.0 to remove dependency on client tools.
This is an automated email from the ASF dual-hosted git repository.
markt 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 16c684b Update to JSign 4.0 to remove dependency on client tools.
16c684b is described below
commit 16c684befa797faac0697adb15bd6911f27feed6
Author: Mark Thomas
AuthorDate: Tue Aug 17 21:08:12 2021 +0100
Update to JSign 4.0 to remove dependency on client tools.
---
build.properties.default | 15 +++
build.xml | 12 +---
webapps/docs/changelog.xml | 4
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index bc8bc41..6b3dc24 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -79,11 +79,10 @@ gpg.exec=/path/to/gpg
# Code signing of Windows installer
# See https://infra.apache.org/digicert-use.html for setup instructions
do.codesigning=false
-codesigning.pkcs11properties=${user.home}/.digicertone/pkcs11properties.cfg
-codesigning.alias=Tomcat-PMC-key-2021-04
+codesigning.alias=Tomcat-PMC-cert-2021-04
codesigning.digest=SHA-512
-codesigning.storetype=PKCS11
-codesigning.storepass=NONE
+codesigning.storetype=DIGICERTONE
+codesigning.storepass=set-this-in-build.properties
# - Settings to use when downloading files -
trydownload.httpusecaches=true
@@ -325,13 +324,13 @@
migration-lib.home=${base.path}/migration-${migration-lib.version}
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
-# - JSign, version 3.1 or later -
-jsign.version=3.1
+# - JSign, version 4.0 or later -
+jsign.version=4.0
-# checksums for JSign 3.1
+# checksums for JSign 4.0
jsign.checksum.enable=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ed924fc86b7abe1dfe22fd8fd7e4c417|5736035f64805b2760a41ebc1ff11523f666f2c7
+jsign.checksum.value=50982facf864df4f08a051b43f7d2e42|3d203fbffdc45e837f98b7c9c5d311b615661a75
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/build.xml b/build.xml
index b0a5da6..fd96d8d 100644
--- a/build.xml
+++ b/build.xml
@@ -2596,7 +2596,6 @@ skip.installer property in build.properties" />
unless="skip.installer"
depends="-installer-create-uninstaller,setup-jsign"
if="${do.codesigning}">
description="Builds and optionally signs the Windows installer"
depends="-installer,setup-jsign" if="${do.codesigning}" >
http://timestamp.digicert.com"/>
+ storepass="${codesigning.storepass}"
+ storetype="${codesigning.storetype}"
+ alias="${codesigning.alias}"
+ alg="${codesigning.digest}"
+ tsaurl="http://timestamp.digicert.com"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 90b4343..6a741f7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,6 +173,10 @@
Fix failing build when building on non-English locales. Pull request
441 provided by Dachuan J. (markt)
+
+Update to JSign version 4.0 to enable code signing without the need for
+the installation of additional client tools. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Parameterise JSign task - no functional change
This is an automated email from the ASF dual-hosted git repository.
markt 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 90da2ca Parameterise JSign task - no functional change
90da2ca is described below
commit 90da2caa0e186c066b57b01bd1cb7b36ee2e
Author: Mark Thomas
AuthorDate: Tue Aug 17 20:37:01 2021 +0100
Parameterise JSign task - no functional change
This is preparation for the move to JSign for
---
build.properties.default | 2 ++
build.xml| 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 77fc389..bc8bc41 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -82,6 +82,8 @@ do.codesigning=false
codesigning.pkcs11properties=${user.home}/.digicertone/pkcs11properties.cfg
codesigning.alias=Tomcat-PMC-key-2021-04
codesigning.digest=SHA-512
+codesigning.storetype=PKCS11
+codesigning.storepass=NONE
# - Settings to use when downloading files -
trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index 3a3011e..b0a5da6 100644
--- a/build.xml
+++ b/build.xml
@@ -2597,8 +2597,8 @@ skip.installer property in build.properties" />
if="${do.codesigning}">
http://timestamp.digicert.com"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-9.0.x
The Buildbot has detected a restored build on builder tomcat-9.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9.0.x/builds/103 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' triggered this build Build Source Stamp: [branch 9.0.x] 8be2290a017f2f7915e779ae1d7dae7cfec93c53 Blamelist: Mark Thomas ,crisgeek <88733156+crisg...@users.noreply.github.com> 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 success in on tomcat-10.0.x
The Buildbot has detected a restored build on builder tomcat-10.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-10.0.x/builds/128 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' triggered this build Build Source Stamp: [branch 10.0.x] d0b0896f3bf16bb4b31810e7f67cf9b7354904ba Blamelist: Mark Thomas ,crisgeek <88733156+crisg...@users.noreply.github.com> Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update http.xml
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 a1f832d Update http.xml a1f832d is described below commit a1f832df31f2619e917afaa20bb288fa5d2aa364 Author: crisgeek <88733156+crisg...@users.noreply.github.com> AuthorDate: Tue Aug 10 12:40:21 2021 -0400 Update http.xml Based on 21-July-2021 conversation with Mark Thomas in Tomcat users group --- webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ac2d530..2fa5c43 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -155,6 +155,11 @@ Document default value for unpackWARs and related clean-up. Pull request 439 provided by Robert Rodewald. (markt) + +Clarify the documentation of the compressionMinSize and +compressibleMimeType HTTP Connector +attributes. Pull request 442 provided by crisgeek. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 28da357..aa1da23 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -416,7 +416,7 @@ text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml . - + If you specify a type explicitly, the default is over-ridden. @@ -446,7 +446,8 @@ If compression is set to "on" then this attribute may be used to specify the minimum amount of data before the output is - compressed. If not specified, this attribute is defaults to "2048". + compressed. If not specified, this attribute is defaults to "2048". + Units are in bytes. - 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: Update http.xml
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 8be2290 Update http.xml 8be2290 is described below commit 8be2290a017f2f7915e779ae1d7dae7cfec93c53 Author: crisgeek <88733156+crisg...@users.noreply.github.com> AuthorDate: Tue Aug 10 12:40:21 2021 -0400 Update http.xml Based on 21-July-2021 conversation with Mark Thomas in Tomcat users group --- webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index cd64663..3025d8a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -155,6 +155,11 @@ Document default value for unpackWARs and related clean-up. Pull request 439 provided by Robert Rodewald. (markt) + +Clarify the documentation of the compressionMinSize and +compressibleMimeType HTTP Connector +attributes. Pull request 442 provided by crisgeek. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 9bf7402..b47efae 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -397,7 +397,7 @@ text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml . - + If you specify a type explicitly, the default is over-ridden. @@ -427,7 +427,8 @@ If compression is set to "on" then this attribute may be used to specify the minimum amount of data before the output is - compressed. If not specified, this attribute is defaults to "2048". + compressed. If not specified, this attribute is defaults to "2048". + Units are in bytes. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #442: Update http.xml, clarified compressionMinSize and compressibleMimeType
markt-asf closed pull request #442: URL: https://github.com/apache/tomcat/pull/442 -- 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
[GitHub] [tomcat] markt-asf commented on pull request #442: Update http.xml, clarified compressionMinSize and compressibleMimeType
markt-asf commented on pull request #442: URL: https://github.com/apache/tomcat/pull/442#issuecomment-900378708 Applied manually so I could add a change log entry. -- 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
[tomcat] branch 10.0.x updated: Update http.xml
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new d0b0896 Update http.xml d0b0896 is described below commit d0b0896f3bf16bb4b31810e7f67cf9b7354904ba Author: crisgeek <88733156+crisg...@users.noreply.github.com> AuthorDate: Tue Aug 10 12:40:21 2021 -0400 Update http.xml Based on 21-July-2021 conversation with Mark Thomas in Tomcat users group --- webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a814ef7..4a24838 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -155,6 +155,11 @@ Document default value for unpackWARs and related clean-up. Pull request 439 provided by Robert Rodewald. (markt) + +Clarify the documentation of the compressionMinSize and +compressibleMimeType HTTP Connector +attributes. Pull request 442 provided by crisgeek. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 876a7d5..04e2abd 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -401,7 +401,7 @@ text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml . - + If you specify a type explicitly, the default is over-ridden. @@ -431,7 +431,8 @@ If compression is set to "on" then this attribute may be used to specify the minimum amount of data before the output is - compressed. If not specified, this attribute is defaults to "2048". + compressed. If not specified, this attribute is defaults to "2048". + Units are in bytes. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (75ba84a -> 026f4fc)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 75ba84a Fix Javadoc warning add 026f4fc Update http.xml No new revisions were added by this update. Summary of changes: webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix Javadoc warning
This is an automated email from the ASF dual-hosted git repository.
markt 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 75ba84a Fix Javadoc warning
75ba84a is described below
commit 75ba84a8e6f1abbeaf1bf242de8c53bdf4951862
Author: Mark Thomas
AuthorDate: Tue Aug 17 15:54:42 2021 +0100
Fix Javadoc warning
---
java/org/apache/catalina/users/GenericGroup.java | 2 ++
java/org/apache/catalina/users/GenericRole.java | 2 ++
java/org/apache/catalina/users/GenericUser.java | 2 ++
3 files changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/users/GenericGroup.java
b/java/org/apache/catalina/users/GenericGroup.java
index d59e57d..986c9f7 100644
--- a/java/org/apache/catalina/users/GenericGroup.java
+++ b/java/org/apache/catalina/users/GenericGroup.java
@@ -31,6 +31,8 @@ import org.apache.catalina.UserDatabase;
* Concrete implementation of {@link org.apache.catalina.Group} for a
* {@link UserDatabase}.
*
+ * @param The specific type of UserDase with which this group is
associated
+ *
* @author Craig R. McClanahan
*/
public class GenericGroup extends AbstractGroup {
diff --git a/java/org/apache/catalina/users/GenericRole.java
b/java/org/apache/catalina/users/GenericRole.java
index c6b0eba..2957280 100644
--- a/java/org/apache/catalina/users/GenericRole.java
+++ b/java/org/apache/catalina/users/GenericRole.java
@@ -24,6 +24,8 @@ import org.apache.catalina.UserDatabase;
* Concrete implementation of {@link org.apache.catalina.Role} for a
* {@link UserDatabase}.
*
+ * @param The specific type of UserDase with which this role is associated
+ *
* @author Craig R. McClanahan
*/
public class GenericRole extends AbstractRole {
diff --git a/java/org/apache/catalina/users/GenericUser.java
b/java/org/apache/catalina/users/GenericUser.java
index 77b70b4..7d69360 100644
--- a/java/org/apache/catalina/users/GenericUser.java
+++ b/java/org/apache/catalina/users/GenericUser.java
@@ -29,6 +29,8 @@ import org.apache.catalina.UserDatabase;
* Concrete implementation of {@link org.apache.catalina.User} for a
* {@link UserDatabase}.
*
+ * @param The specific type of UserDase with which this role is associated
+ *
* @author Craig R. McClanahan
*/
public class GenericUser extends AbstractUser {
-
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 Javadoc warning
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 8c5133d Fix Javadoc warning
8c5133d is described below
commit 8c5133d6691e8a4002d492d66918fcbdc177988c
Author: Mark Thomas
AuthorDate: Tue Aug 17 15:49:33 2021 +0100
Fix Javadoc warning
---
java/org/apache/catalina/authenticator/AuthenticatorBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 2c96a0b..3dc0e0f 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1373,7 +1373,7 @@ public abstract class AuthenticatorBase extends ValveBase
* Can the authenticator perform preemptive authentication for the given
* request?
*
- * @param request
+ * @param request The request to check for credentials
*
* @return {@code true} if preemptive authentication is possible, otherwise
* {@code false}
-
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 Javadoc warning
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 88f853d Fix Javadoc warning
88f853d is described below
commit 88f853d54d87f0f0ddb6b04563e1a0c7d082f44b
Author: Mark Thomas
AuthorDate: Tue Aug 17 15:49:33 2021 +0100
Fix Javadoc warning
---
java/org/apache/catalina/authenticator/AuthenticatorBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index ad67a4a..2788618 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1371,7 +1371,7 @@ public abstract class AuthenticatorBase extends ValveBase
* Can the authenticator perform preemptive authentication for the given
* request?
*
- * @param request
+ * @param request The request to check for credentials
*
* @return {@code true} if preemptive authentication is possible, otherwise
* {@code false}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix Javadoc warning
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 97e5178 Fix Javadoc warning
97e5178 is described below
commit 97e517894b3eb553862d6d0876ea228dc4fbe0d8
Author: Mark Thomas
AuthorDate: Tue Aug 17 15:49:33 2021 +0100
Fix Javadoc warning
---
java/org/apache/catalina/authenticator/AuthenticatorBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 4a26b51..80aa13d 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1372,7 +1372,7 @@ public abstract class AuthenticatorBase extends ValveBase
* Can the authenticator perform preemptive authentication for the given
* request?
*
- * @param request
+ * @param request The request to check for credentials
*
* @return {@code true} if preemptive authentication is possible, otherwise
* {@code false}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix Javadoc warning
This is an automated email from the ASF dual-hosted git repository.
markt 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 263fb37 Fix Javadoc warning
263fb37 is described below
commit 263fb37b6507203aece9c8afb77272654cad80d1
Author: Mark Thomas
AuthorDate: Tue Aug 17 15:49:33 2021 +0100
Fix Javadoc warning
---
java/org/apache/catalina/authenticator/AuthenticatorBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 4a26b51..80aa13d 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1372,7 +1372,7 @@ public abstract class AuthenticatorBase extends ValveBase
* Can the authenticator perform preemptive authentication for the given
* request?
*
- * @param request
+ * @param request The request to check for credentials
*
* @return {@code true} if preemptive authentication is possible, otherwise
* {@code false}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-9.0.x
The Buildbot has detected a new failure on builder tomcat-9.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9.0.x/builds/102 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' triggered this build Build Source Stamp: [branch 9.0.x] d40cf2715094172a489591fb73176ef98e791229 Blamelist: Robert Rodewald BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #444: Delegate check for preemptive authentication from AuthenticatorBase to affected Authenticators
markt-asf commented on pull request #444: URL: https://github.com/apache/tomcat/pull/444#issuecomment-900362561 Applied manually so I could: - add a change log entry - tweak the code formatting - retain SSL preemptive auth -- 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
[GitHub] [tomcat] markt-asf closed pull request #444: Delegate check for preemptive authentication from AuthenticatorBase to affected Authenticators
markt-asf closed pull request #444: URL: https://github.com/apache/tomcat/pull/444 -- 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
buildbot failure in on tomcat-10.0.x
The Buildbot has detected a new failure on builder tomcat-10.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-10.0.x/builds/127 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' triggered this build Build Source Stamp: [branch 10.0.x] 06f1f152c28b651bd4f5a81a0b882b60f70f1f9b Blamelist: Dachuan J ,Robert Rodewald BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] michael-o commented on pull request #444: Delegate check for preemptive authentication from AuthenticatorBase to affected Authenticators
michael-o commented on pull request #444: URL: https://github.com/apache/tomcat/pull/444#issuecomment-900359300 > > > Preemptive authentication for TLS needs to be retained. There are a few edge cases where it still has an effect. For example when `certificateVerification="optional"` is used. Can you explain how? -- 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
buildbot success in on tomcat-8.5.x
The Buildbot has detected a restored build on builder tomcat-8.5.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-8.5.x/builds/88 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8.5-commit' triggered this build Build Source Stamp: [branch 8.5.x] 53827364b61bafa9dabe452b2ed2e663b39fac9a Blamelist: Dachuan J ,Mark Thomas ,Robert Rodewald Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Refactored check for preemptive authentication
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 eb46fea Refactored check for preemptive authentication
eb46fea is described below
commit eb46feacc6282dbe96537f22f1f4b3ca18082ec1
Author: Robert Rodewald
AuthorDate: Tue Aug 10 19:11:24 2021 +0200
Refactored check for preemptive authentication
- new protected method isPreemptiveAuthPossible() in AuthenticatorBase
which is overridden in some authenticators
- moved getRequestCertificates() from AuthenticatorBase to
SSLAuthenticator
- Added more specific check for value of header "authorization"
# Conflicts:
# webapps/docs/changelog.xml
# Conflicts:
# java/org/apache/catalina/authenticator/AuthenticatorBase.java
---
.../catalina/authenticator/AuthenticatorBase.java | 56 +++---
.../catalina/authenticator/BasicAuthenticator.java | 8
.../authenticator/DigestAuthenticator.java | 8
.../catalina/authenticator/SSLAuthenticator.java | 39 +++
.../authenticator/SpnegoAuthenticator.java | 7 +++
webapps/docs/changelog.xml | 6 +++
6 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 550113c..2c96a0b 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -18,7 +18,6 @@ package org.apache.catalina.authenticator;
import java.io.IOException;
import java.security.Principal;
-import java.security.cert.X509Certificate;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -61,7 +60,6 @@ import org.apache.catalina.util.SessionIdGeneratorBase;
import org.apache.catalina.util.StandardSessionIdGenerator;
import org.apache.catalina.valves.RemoteIpValve;
import org.apache.catalina.valves.ValveBase;
-import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -598,15 +596,9 @@ public abstract class AuthenticatorBase extends ValveBase
authRequired = true;
}
-if (!authRequired && context.getPreemptiveAuthentication()) {
-authRequired =
-
request.getCoyoteRequest().getMimeHeaders().getValue("authorization") != null;
-}
-
if (!authRequired && context.getPreemptiveAuthentication() &&
-HttpServletRequest.CLIENT_CERT_AUTH.equals(getAuthMethod())) {
-X509Certificate[] certs = getRequestCertificates(request);
-authRequired = certs != null && certs.length > 0;
+isPreemptiveAuthPossible(request)) {
+authRequired = true;
}
JaspicState jaspicState = null;
@@ -864,35 +856,6 @@ public abstract class AuthenticatorBase extends ValveBase
/**
- * Look for the X509 certificate chain in the Request under the key
- * javax.servlet.request.X509Certificate. If not found,
trigger
- * extracting the certificate chain from the Coyote request.
- *
- * @param request
- *Request to be processed
- *
- * @return The X509 certificate chain if found, null
otherwise.
- */
-protected X509Certificate[] getRequestCertificates(final Request request)
-throws IllegalStateException {
-
-X509Certificate certs[] =
-(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-
-if ((certs == null) || (certs.length < 1)) {
-try {
-
request.getCoyoteRequest().action(ActionCode.REQ_SSL_CERTIFICATE, null);
-certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-} catch (IllegalStateException ise) {
-// Request body was too large for save buffer
-// Return null which will trigger an auth failure
-}
-}
-
-return certs;
-}
-
-/**
* Associate the specified single sign on identifier with the specified
* Session.
*
@@ -1388,6 +1351,7 @@ public abstract class AuthenticatorBase extends ValveBase
super.startInternal();
}
+
/**
* Stop this component and implement the requirements of
* {@link org.apache.catalina.util.LifecycleBase#stopInternal()}.
@@ -1405,6 +1369,20 @@ public abstract class AuthenticatorBase extends ValveBase
}
+/**
+ * Can the authenticator perform preemptive authentication for the given
+ * request?
+ *
+ * @param request
+ *
+ * @return {@code true} if preemptive authentication is possible,
[tomcat] branch 9.0.x updated: Refactored check for preemptive authentication
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 d40cf27 Refactored check for preemptive authentication
d40cf27 is described below
commit d40cf2715094172a489591fb73176ef98e791229
Author: Robert Rodewald
AuthorDate: Tue Aug 10 19:11:24 2021 +0200
Refactored check for preemptive authentication
- new protected method isPreemptiveAuthPossible() in AuthenticatorBase
which is overridden in some authenticators
- moved getRequestCertificates() from AuthenticatorBase to
SSLAuthenticator
- Added more specific check for value of header "authorization"
# Conflicts:
# webapps/docs/changelog.xml
# Conflicts:
# java/org/apache/catalina/authenticator/AuthenticatorBase.java
---
.../catalina/authenticator/AuthenticatorBase.java | 56 +++---
.../catalina/authenticator/BasicAuthenticator.java | 8
.../authenticator/DigestAuthenticator.java | 8
.../catalina/authenticator/SSLAuthenticator.java | 39 +++
.../authenticator/SpnegoAuthenticator.java | 7 +++
webapps/docs/changelog.xml | 6 +++
6 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index c46b0ba..ad67a4a 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -18,7 +18,6 @@ package org.apache.catalina.authenticator;
import java.io.IOException;
import java.security.Principal;
-import java.security.cert.X509Certificate;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
@@ -61,7 +60,6 @@ import org.apache.catalina.util.SessionIdGeneratorBase;
import org.apache.catalina.util.StandardSessionIdGenerator;
import org.apache.catalina.valves.RemoteIpValve;
import org.apache.catalina.valves.ValveBase;
-import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -596,15 +594,9 @@ public abstract class AuthenticatorBase extends ValveBase
authRequired = true;
}
-if (!authRequired && context.getPreemptiveAuthentication()) {
-authRequired =
-
request.getCoyoteRequest().getMimeHeaders().getValue("authorization") != null;
-}
-
if (!authRequired && context.getPreemptiveAuthentication() &&
-HttpServletRequest.CLIENT_CERT_AUTH.equals(getAuthMethod())) {
-X509Certificate[] certs = getRequestCertificates(request);
-authRequired = certs != null && certs.length > 0;
+isPreemptiveAuthPossible(request)) {
+authRequired = true;
}
JaspicState jaspicState = null;
@@ -862,35 +854,6 @@ public abstract class AuthenticatorBase extends ValveBase
/**
- * Look for the X509 certificate chain in the Request under the key
- * javax.servlet.request.X509Certificate. If not found,
trigger
- * extracting the certificate chain from the Coyote request.
- *
- * @param request
- *Request to be processed
- *
- * @return The X509 certificate chain if found, null
otherwise.
- */
-protected X509Certificate[] getRequestCertificates(final Request request)
-throws IllegalStateException {
-
-X509Certificate certs[] =
-(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-
-if ((certs == null) || (certs.length < 1)) {
-try {
-
request.getCoyoteRequest().action(ActionCode.REQ_SSL_CERTIFICATE, null);
-certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-} catch (IllegalStateException ise) {
-// Request body was too large for save buffer
-// Return null which will trigger an auth failure
-}
-}
-
-return certs;
-}
-
-/**
* Associate the specified single sign on identifier with the specified
* Session.
*
@@ -1386,6 +1349,7 @@ public abstract class AuthenticatorBase extends ValveBase
super.startInternal();
}
+
/**
* Stop this component and implement the requirements of
* {@link org.apache.catalina.util.LifecycleBase#stopInternal()}.
@@ -1403,6 +1367,20 @@ public abstract class AuthenticatorBase extends ValveBase
}
+/**
+ * Can the authenticator perform preemptive authentication for the given
+ * request?
+ *
+ * @param request
+ *
+ * @return {@code true} if preemptive authentication is possible,
[tomcat] branch 10.0.x updated: Refactored check for preemptive authentication
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 06f1f15 Refactored check for preemptive authentication
06f1f15 is described below
commit 06f1f152c28b651bd4f5a81a0b882b60f70f1f9b
Author: Robert Rodewald
AuthorDate: Tue Aug 10 19:11:24 2021 +0200
Refactored check for preemptive authentication
- new protected method isPreemptiveAuthPossible() in AuthenticatorBase
which is overridden in some authenticators
- moved getRequestCertificates() from AuthenticatorBase to
SSLAuthenticator
- Added more specific check for value of header "authorization"
# Conflicts:
# webapps/docs/changelog.xml
---
.../catalina/authenticator/AuthenticatorBase.java | 56 +++---
.../catalina/authenticator/BasicAuthenticator.java | 8
.../authenticator/DigestAuthenticator.java | 8
.../catalina/authenticator/SSLAuthenticator.java | 39 +++
.../authenticator/SpnegoAuthenticator.java | 7 +++
webapps/docs/changelog.xml | 6 +++
6 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index d751582..4a26b51 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -18,7 +18,6 @@ package org.apache.catalina.authenticator;
import java.io.IOException;
import java.security.Principal;
-import java.security.cert.X509Certificate;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
@@ -62,7 +61,6 @@ import org.apache.catalina.util.SessionIdGeneratorBase;
import org.apache.catalina.util.StandardSessionIdGenerator;
import org.apache.catalina.valves.RemoteIpValve;
import org.apache.catalina.valves.ValveBase;
-import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -597,15 +595,9 @@ public abstract class AuthenticatorBase extends ValveBase
authRequired = true;
}
-if (!authRequired && context.getPreemptiveAuthentication()) {
-authRequired =
-
request.getCoyoteRequest().getMimeHeaders().getValue("authorization") != null;
-}
-
if (!authRequired && context.getPreemptiveAuthentication() &&
-HttpServletRequest.CLIENT_CERT_AUTH.equals(getAuthMethod())) {
-X509Certificate[] certs = getRequestCertificates(request);
-authRequired = certs != null && certs.length > 0;
+isPreemptiveAuthPossible(request)) {
+authRequired = true;
}
JaspicState jaspicState = null;
@@ -863,35 +855,6 @@ public abstract class AuthenticatorBase extends ValveBase
/**
- * Look for the X509 certificate chain in the Request under the key
- * jakarta.servlet.request.X509Certificate. If not found,
trigger
- * extracting the certificate chain from the Coyote request.
- *
- * @param request
- *Request to be processed
- *
- * @return The X509 certificate chain if found, null
otherwise.
- */
-protected X509Certificate[] getRequestCertificates(final Request request)
-throws IllegalStateException {
-
-X509Certificate certs[] =
-(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-
-if ((certs == null) || (certs.length < 1)) {
-try {
-
request.getCoyoteRequest().action(ActionCode.REQ_SSL_CERTIFICATE, null);
-certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-} catch (IllegalStateException ise) {
-// Request body was too large for save buffer
-// Return null which will trigger an auth failure
-}
-}
-
-return certs;
-}
-
-/**
* Associate the specified single sign on identifier with the specified
* Session.
*
@@ -1387,6 +1350,7 @@ public abstract class AuthenticatorBase extends ValveBase
super.startInternal();
}
+
/**
* Stop this component and implement the requirements of
* {@link org.apache.catalina.util.LifecycleBase#stopInternal()}.
@@ -1404,6 +1368,20 @@ public abstract class AuthenticatorBase extends ValveBase
}
+/**
+ * Can the authenticator perform preemptive authentication for the given
+ * request?
+ *
+ * @param request
+ *
+ * @return {@code true} if preemptive authentication is possible, otherwise
+ * {@code false}
+ */
+protected boolean
[tomcat] branch main updated: Refactored check for preemptive authentication
This is an automated email from the ASF dual-hosted git repository.
markt 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 93f5911 Refactored check for preemptive authentication
93f5911 is described below
commit 93f5911c0c80c081e5d080de14f02f35ae637592
Author: Robert Rodewald
AuthorDate: Tue Aug 10 19:11:24 2021 +0200
Refactored check for preemptive authentication
- new protected method isPreemptiveAuthPossible() in AuthenticatorBase
which is overridden in some authenticators
- moved getRequestCertificates() from AuthenticatorBase to
SSLAuthenticator
- Added more specific check for value of header "authorization"
---
.../catalina/authenticator/AuthenticatorBase.java | 56 +++---
.../catalina/authenticator/BasicAuthenticator.java | 8
.../authenticator/DigestAuthenticator.java | 8
.../catalina/authenticator/SSLAuthenticator.java | 39 +++
.../authenticator/SpnegoAuthenticator.java | 7 +++
webapps/docs/changelog.xml | 6 +++
6 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index d751582..4a26b51 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -18,7 +18,6 @@ package org.apache.catalina.authenticator;
import java.io.IOException;
import java.security.Principal;
-import java.security.cert.X509Certificate;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
@@ -62,7 +61,6 @@ import org.apache.catalina.util.SessionIdGeneratorBase;
import org.apache.catalina.util.StandardSessionIdGenerator;
import org.apache.catalina.valves.RemoteIpValve;
import org.apache.catalina.valves.ValveBase;
-import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -597,15 +595,9 @@ public abstract class AuthenticatorBase extends ValveBase
authRequired = true;
}
-if (!authRequired && context.getPreemptiveAuthentication()) {
-authRequired =
-
request.getCoyoteRequest().getMimeHeaders().getValue("authorization") != null;
-}
-
if (!authRequired && context.getPreemptiveAuthentication() &&
-HttpServletRequest.CLIENT_CERT_AUTH.equals(getAuthMethod())) {
-X509Certificate[] certs = getRequestCertificates(request);
-authRequired = certs != null && certs.length > 0;
+isPreemptiveAuthPossible(request)) {
+authRequired = true;
}
JaspicState jaspicState = null;
@@ -863,35 +855,6 @@ public abstract class AuthenticatorBase extends ValveBase
/**
- * Look for the X509 certificate chain in the Request under the key
- * jakarta.servlet.request.X509Certificate. If not found,
trigger
- * extracting the certificate chain from the Coyote request.
- *
- * @param request
- *Request to be processed
- *
- * @return The X509 certificate chain if found, null
otherwise.
- */
-protected X509Certificate[] getRequestCertificates(final Request request)
-throws IllegalStateException {
-
-X509Certificate certs[] =
-(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-
-if ((certs == null) || (certs.length < 1)) {
-try {
-
request.getCoyoteRequest().action(ActionCode.REQ_SSL_CERTIFICATE, null);
-certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
-} catch (IllegalStateException ise) {
-// Request body was too large for save buffer
-// Return null which will trigger an auth failure
-}
-}
-
-return certs;
-}
-
-/**
* Associate the specified single sign on identifier with the specified
* Session.
*
@@ -1387,6 +1350,7 @@ public abstract class AuthenticatorBase extends ValveBase
super.startInternal();
}
+
/**
* Stop this component and implement the requirements of
* {@link org.apache.catalina.util.LifecycleBase#stopInternal()}.
@@ -1404,6 +1368,20 @@ public abstract class AuthenticatorBase extends ValveBase
}
+/**
+ * Can the authenticator perform preemptive authentication for the given
+ * request?
+ *
+ * @param request
+ *
+ * @return {@code true} if preemptive authentication is possible, otherwise
+ * {@code false}
+ */
+protected boolean isPreemptiveAuthPossible(Request request) {
+return false;
+}
+
+
[GitHub] [tomcat] markt-asf commented on pull request #444: Delegate check for preemptive authentication from AuthenticatorBase to affected Authenticators
markt-asf commented on pull request #444: URL: https://github.com/apache/tomcat/pull/444#issuecomment-900303347 Preemptive authentication for TLS needs to be retained. There are a few edge cases where it still has an effect. For example when `certificateVerification="optional"` is used. -- 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
[tomcat] branch main updated: Improve the reusability of UserDatabase code
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 5376d45 Improve the reusability of UserDatabase code
5376d45 is described below
commit 5376d45258b8bf496951a99eab435517d2ed70f0
Author: remm
AuthorDate: Tue Aug 17 14:56:24 2021 +0200
Improve the reusability of UserDatabase code
Add intermediate concrete implementation classes. Add hooks to allow
partail database updates on save. Will likely make alternate
implementations more realistic.
---
java/org/apache/catalina/UserDatabase.java | 27
.../users/{MemoryGroup.java => GenericGroup.java} | 60
.../users/{MemoryRole.java => GenericRole.java}| 44 +++---
.../users/{MemoryUser.java => GenericUser.java}| 126
java/org/apache/catalina/users/MemoryGroup.java| 116 +--
java/org/apache/catalina/users/MemoryRole.java | 36 +
java/org/apache/catalina/users/MemoryUser.java | 158 +
webapps/docs/changelog.xml | 5 +
8 files changed, 138 insertions(+), 434 deletions(-)
diff --git a/java/org/apache/catalina/UserDatabase.java
b/java/org/apache/catalina/UserDatabase.java
index 8bac810..9242170 100644
--- a/java/org/apache/catalina/UserDatabase.java
+++ b/java/org/apache/catalina/UserDatabase.java
@@ -156,6 +156,33 @@ public interface UserDatabase {
/**
+ * Signal the specified {@link Group} from this user database has been
+ * modified.
+ *
+ * @param group The group that has been modified
+ */
+public default void modifiedGroup(Group group) {}
+
+
+/**
+ * Signal the specified {@link Role} from this user database has been
+ * modified.
+ *
+ * @param role The role that has been modified
+ */
+public default void modifiedRole(Role role) {}
+
+
+/**
+ * Signal the specified {@link User} from this user database has been
+ * modified.
+ *
+ * @param user The user that has been modified
+ */
+public default void modifiedUser(User user) {}
+
+
+/**
* Save any updated information to the persistent storage location for this
* user database.
*
diff --git a/java/org/apache/catalina/users/MemoryGroup.java
b/java/org/apache/catalina/users/GenericGroup.java
similarity index 73%
copy from java/org/apache/catalina/users/MemoryGroup.java
copy to java/org/apache/catalina/users/GenericGroup.java
index aad4180..d59e57d 100644
--- a/java/org/apache/catalina/users/MemoryGroup.java
+++ b/java/org/apache/catalina/users/GenericGroup.java
@@ -25,17 +25,15 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.catalina.Role;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
-import org.apache.tomcat.util.buf.StringUtils;
/**
- * Concrete implementation of {@link org.apache.catalina.Group} for the
- * {@link MemoryUserDatabase} implementation of {@link UserDatabase}.
+ * Concrete implementation of {@link org.apache.catalina.Group} for a
+ * {@link UserDatabase}.
*
* @author Craig R. McClanahan
- * @since 4.1
*/
-public class MemoryGroup extends AbstractGroup {
+public class GenericGroup extends AbstractGroup {
// --- Constructors
@@ -43,19 +41,23 @@ public class MemoryGroup extends AbstractGroup {
/**
* Package-private constructor used by the factory method in
- * {@link MemoryUserDatabase}.
+ * {@link UserDatabase}.
*
- * @param database The {@link MemoryUserDatabase} that owns this group
+ * @param database The {@link UserDatabase} that owns this group
* @param groupname Group name of this group
* @param description Description of this group
+ * @param roles The roles of this group
*/
-MemoryGroup(MemoryUserDatabase database,
-String groupname, String description) {
+GenericGroup(UD database,
+String groupname, String description, List roles) {
super();
this.database = database;
-setGroupname(groupname);
-setDescription(description);
+this.groupname = groupname;
+this.description = description;
+if (roles != null) {
+this.roles.addAll(roles);
+}
}
@@ -64,9 +66,9 @@ public class MemoryGroup extends AbstractGroup {
/**
- * The {@link MemoryUserDatabase} that owns this group.
+ * The {@link UserDatabase} that owns this group.
*/
-protected final MemoryUserDatabase database;
+protected final UD database;
/**
@@ -123,7 +125,9 @@ public class MemoryGroup extends AbstractGroup {
*/
@Override
public void addRole(Role role) {
-roles.addIfAbsent(role);
+if (roles.addIfAbsent(role))
[GitHub] [tomcat] markt-asf commented on pull request #441: Fix build fail when locale is not en
markt-asf commented on pull request #441: URL: https://github.com/apache/tomcat/pull/441#issuecomment-900271591 Thanks for the PR. I applied it manually so I could add a change log entry. -- 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
[GitHub] [tomcat] markt-asf closed pull request #441: Fix build fail when locale is not en
markt-asf closed pull request #441: URL: https://github.com/apache/tomcat/pull/441 -- 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
[tomcat] branch 8.5.x updated: Fix build fail when locale is not 'en'
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 5382736 Fix build fail when locale is not 'en' 5382736 is described below commit 53827364b61bafa9dabe452b2ed2e663b39fac9a Author: Dachuan J AuthorDate: Tue Aug 10 14:28:16 2021 +0800 Fix build fail when locale is not 'en' --- build.xml | 16 modules/jdbc-pool/build.xml | 2 +- webapps/docs/changelog.xml | 8 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index 4bf6e98..d30526a 100644 --- a/build.xml +++ b/build.xml @@ -268,7 +268,7 @@ - + @@ -1413,7 +1413,7 @@ - + @@ -2248,7 +2248,7 @@ skip.installer property in build.properties" /> - + @@ -2279,7 +2279,7 @@ skip.installer property in build.properties" /> - + @@ -2521,7 +2521,7 @@ skip.installer property in build.properties" /> - + @@ -2574,7 +2574,7 @@ skip.installer property in build.properties" /> - + @@ -2603,7 +2603,7 @@ skip.installer property in build.properties" /> - + @@ -2653,7 +2653,7 @@ skip.installer property in build.properties" /> - + diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 59e81ca..408e890 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -86,7 +86,7 @@ - + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 78a33a2..246de40 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -151,6 +151,14 @@ + + + +Fix failing build when building on non-English locales. Pull request +441 provided by Dachuan J. (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 build fail when locale is not 'en'
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 9d1fd3f Fix build fail when locale is not 'en' 9d1fd3f is described below commit 9d1fd3f8d495f98bba1a114830824cbbfe79d27f Author: Dachuan J AuthorDate: Tue Aug 10 14:28:16 2021 +0800 Fix build fail when locale is not 'en' --- build.xml | 16 modules/jdbc-pool/build.xml | 2 +- webapps/docs/changelog.xml | 8 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index 32c59ef..1aef121 100644 --- a/build.xml +++ b/build.xml @@ -270,7 +270,7 @@ - + @@ -1794,7 +1794,7 @@ - + @@ -2567,7 +2567,7 @@ skip.installer property in build.properties" /> - + @@ -2598,7 +2598,7 @@ skip.installer property in build.properties" /> - + @@ -2833,7 +2833,7 @@ skip.installer property in build.properties" /> - + @@ -2886,7 +2886,7 @@ skip.installer property in build.properties" /> - + @@ -2915,7 +2915,7 @@ skip.installer property in build.properties" /> - + @@ -2967,7 +2967,7 @@ skip.installer property in build.properties" /> - + diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 6d9f8bb..2feb3a4 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -86,7 +86,7 @@ - + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d2cf0c5..b6f0f82 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -151,6 +151,14 @@ + + + +Fix failing build when building on non-English locales. Pull request +441 provided by Dachuan J. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix build fail when locale is not 'en'
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new b5d4931 Fix build fail when locale is not 'en' b5d4931 is described below commit b5d49310da55cc54802b87578ffbf4e40d1763b1 Author: Dachuan J AuthorDate: Tue Aug 10 14:28:16 2021 +0800 Fix build fail when locale is not 'en' --- build.xml | 16 modules/jdbc-pool/build.xml | 2 +- webapps/docs/changelog.xml | 8 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index 0edfa2c..1ce3b7f 100644 --- a/build.xml +++ b/build.xml @@ -271,7 +271,7 @@ - + @@ -1812,7 +1812,7 @@ - + @@ -2585,7 +2585,7 @@ skip.installer property in build.properties" /> - + @@ -2616,7 +2616,7 @@ skip.installer property in build.properties" /> - + @@ -2851,7 +2851,7 @@ skip.installer property in build.properties" /> - + @@ -2904,7 +2904,7 @@ skip.installer property in build.properties" /> - + @@ -2933,7 +2933,7 @@ skip.installer property in build.properties" /> - + @@ -2985,7 +2985,7 @@ skip.installer property in build.properties" /> - + diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 6d9f8bb..2feb3a4 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -86,7 +86,7 @@ - + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9d7a890..3823930 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -151,6 +151,14 @@ + + + +Fix failing build when building on non-English locales. Pull request +441 provided by Dachuan J. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix build fail when locale is not 'en'
This is an automated email from the ASF dual-hosted git repository. markt 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 27b8664 Fix build fail when locale is not 'en' 27b8664 is described below commit 27b86640335bba9e0e167425102ab916e79e4d3f Author: Dachuan J AuthorDate: Tue Aug 10 14:28:16 2021 +0800 Fix build fail when locale is not 'en' --- build.xml | 16 modules/jdbc-pool/build.xml | 2 +- webapps/docs/changelog.xml | 8 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index 80f0495..3a3011e 100644 --- a/build.xml +++ b/build.xml @@ -244,7 +244,7 @@ - + @@ -1785,7 +1785,7 @@ - + @@ -2556,7 +2556,7 @@ skip.installer property in build.properties" /> - + @@ -2587,7 +2587,7 @@ skip.installer property in build.properties" /> - + @@ -2822,7 +2822,7 @@ skip.installer property in build.properties" /> - + @@ -2875,7 +2875,7 @@ skip.installer property in build.properties" /> - + @@ -2904,7 +2904,7 @@ skip.installer property in build.properties" /> - + @@ -2956,7 +2956,7 @@ skip.installer property in build.properties" /> - + diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 6d9f8bb..2feb3a4 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -86,7 +86,7 @@ - + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7e63112..eee49bb 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -151,6 +151,14 @@ + + + +Fix failing build when building on non-English locales. Pull request +441 provided by Dachuan J. (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: Improvements to documentation
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 8f2f598 Improvements to documentation 8f2f598 is described below commit 8f2f598bfdf1602b6986b6dcc5c5ab8ee4579088 Author: Mark Thomas AuthorDate: Tue Aug 17 13:05:47 2021 +0100 Improvements to documentation - Documented default for unpackWARs - Tagged all boolean values as code - Punctuation PR provided by Robert Rodewald # Conflicts: # webapps/docs/config/context.xml --- webapps/docs/changelog.xml | 4 +++ webapps/docs/config/context.xml | 59 ++--- webapps/docs/config/host.xml| 48 + 3 files changed, 60 insertions(+), 51 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a877645..78a33a2 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,10 @@ Remove unnecessary Context settings from the examples web application. (markt) + +Document default value for unpackWARs and related clean-up. +Pull request 439 provided by Robert Rodewald. (markt) + diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 0adb5e3..65a4f53 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -183,8 +183,9 @@ Disable autoDeploy and deployOnStartup and define all Contexts in server.xml - Locate the WAR and/or directory outside of the Hosts appBase and use - a context.xml file with a docBase attribute to define it. + Locate the WAR and/or directory outside of the Hosts + appBase and use a context.xml file with a + docBase attribute to define it. @@ -263,14 +264,14 @@ -Set to true if Tomcat should automatically parse +Set to true if Tomcat should automatically parse multipart/form-data request bodies when HttpServletRequest.getPart* or HttpServletRequest.getParameter* is called, even when the target servlet isn't marked with the @MultipartConfig annotation (See Servlet Specification 3.0, Section 3.2 for details). Note that any setting other than false causes Tomcat to behave in a way that is not technically spec-compliant. -The default is false +The default is false. @@ -363,8 +364,8 @@ The value of this field must not be set unless the Context element is defined in server.xml or the docBase is not located under the Hosts appBase. -If a symbolic link is used for docBase then changes to the -symbolic link will only be effective after a Tomcat restart or +If a symbolic link is used for docBase then changes to +the symbolic link will only be effective after a Tomcat restart or by undeploying and redeploying the context. A context reload is not sufficient. @@ -437,13 +438,15 @@ will process all requests not assigned to other Contexts. This attribute must only be used when statically defining a Context in server.xml. In all other circumstances, the path will be inferred -from the filenames used for either the .xml context file or the docBase. +from the filenames used for either the .xml context file or the +docBase. Even when statically defining a Context in server.xml, this attribute -must not be set unless either the docBase is not located under the -Hosts appBase or both -deployOnStartup and autoDeploy are false. If -this rule is not followed, double deployment is likely to result. +must not be set unless either the docBase is not located +under the Hosts appBase or +both deployOnStartup and autoDeploy are +false. If this rule is not followed, double deployment is +likely to result. @@ -556,9 +559,9 @@ -Set to false if Tomcat should not read any additional request -body data for aborted uploads and instead abort the client connection. -This setting is used in the following situations: +Set to false if Tomcat should not read any +additional request body data for aborted uploads and instead abort the +client connection. This setting is used in the following situations: the size of the request body is larger than the @@ -710,7 +713,7 @@ -If true, Tomcat will prevent any file locking. +If true, Tomcat will prevent any file locking. This will significantly impact startup time of applications, but allows full webapp hot deploy and undeploy
[tomcat] branch 9.0.x updated: Improvements to documentation
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 92d6452 Improvements to documentation 92d6452 is described below commit 92d6452a7328d139a116a6eb1e87c2ccda33a65c Author: Mark Thomas AuthorDate: Tue Aug 17 13:05:47 2021 +0100 Improvements to documentation - Documented default for unpackWARs - Tagged all boolean values as code - Punctuation PR provided by Robert Rodewald # Conflicts: # webapps/docs/config/context.xml --- webapps/docs/changelog.xml | 4 +++ webapps/docs/config/context.xml | 59 ++--- webapps/docs/config/host.xml| 48 + 3 files changed, 60 insertions(+), 51 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 474f354..d2cf0c5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,10 @@ Remove unnecessary Context settings from the examples web application. (markt) + +Document default value for unpackWARs and related clean-up. +Pull request 439 provided by Robert Rodewald. (markt) + diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 1b9252a..d118196 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -183,8 +183,9 @@ Disable autoDeploy and deployOnStartup and define all Contexts in server.xml - Locate the WAR and/or directory outside of the Hosts appBase and use - a context.xml file with a docBase attribute to define it. + Locate the WAR and/or directory outside of the Hosts + appBase and use a context.xml file with a + docBase attribute to define it. @@ -263,14 +264,14 @@ -Set to true if Tomcat should automatically parse +Set to true if Tomcat should automatically parse multipart/form-data request bodies when HttpServletRequest.getPart* or HttpServletRequest.getParameter* is called, even when the target servlet isn't marked with the @MultipartConfig annotation (See Servlet Specification 3.0, Section 3.2 for details). Note that any setting other than false causes Tomcat to behave in a way that is not technically spec-compliant. -The default is false +The default is false. @@ -363,8 +364,8 @@ The value of this field must not be set unless the Context element is defined in server.xml or the docBase is not located under the Hosts appBase. -If a symbolic link is used for docBase then changes to the -symbolic link will only be effective after a Tomcat restart or +If a symbolic link is used for docBase then changes to +the symbolic link will only be effective after a Tomcat restart or by undeploying and redeploying the context. A context reload is not sufficient. @@ -445,13 +446,15 @@ will process all requests not assigned to other Contexts. This attribute must only be used when statically defining a Context in server.xml. In all other circumstances, the path will be inferred -from the filenames used for either the .xml context file or the docBase. +from the filenames used for either the .xml context file or the +docBase. Even when statically defining a Context in server.xml, this attribute -must not be set unless either the docBase is not located under the -Hosts appBase or both -deployOnStartup and autoDeploy are false. If -this rule is not followed, double deployment is likely to result. +must not be set unless either the docBase is not located +under the Hosts appBase or +both deployOnStartup and autoDeploy are +false. If this rule is not followed, double deployment is +likely to result. @@ -564,9 +567,9 @@ -Set to false if Tomcat should not read any additional request -body data for aborted uploads and instead abort the client connection. -This setting is used in the following situations: +Set to false if Tomcat should not read any +additional request body data for aborted uploads and instead abort the +client connection. This setting is used in the following situations: the size of the request body is larger than the @@ -727,7 +730,7 @@ -If true, Tomcat will prevent any file locking. +If true, Tomcat will prevent any file locking. This will significantly impact startup time of applications, but allows full webapp hot deploy and undeploy
[tomcat] branch 10.0.x updated: Improvements to documentation
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 7bf0c97 Improvements to documentation 7bf0c97 is described below commit 7bf0c97392efc89d9b39ef6d3ae0ae34ec1564a5 Author: Mark Thomas AuthorDate: Tue Aug 17 13:05:47 2021 +0100 Improvements to documentation - Documented default for unpackWARs - Tagged all boolean values as code - Punctuation PR provided by Robert Rodewald --- webapps/docs/changelog.xml | 4 +++ webapps/docs/config/context.xml | 59 ++--- webapps/docs/config/host.xml| 48 + 3 files changed, 60 insertions(+), 51 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9162ebb..9d7a890 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,10 @@ Remove unnecessary Context settings from the examples web application. (markt) + +Document default value for unpackWARs and related clean-up. +Pull request 439 provided by Robert Rodewald. (markt) + diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 0f210df..c7d8b46 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -183,8 +183,9 @@ Disable autoDeploy and deployOnStartup and define all Contexts in server.xml - Locate the WAR and/or directory outside of the Hosts appBase and use - a context.xml file with a docBase attribute to define it. + Locate the WAR and/or directory outside of the Hosts + appBase and use a context.xml file with a + docBase attribute to define it. @@ -263,14 +264,14 @@ -Set to true if Tomcat should automatically parse +Set to true if Tomcat should automatically parse multipart/form-data request bodies when HttpServletRequest.getPart* or HttpServletRequest.getParameter* is called, even when the target servlet isn't marked with the @MultipartConfig annotation (See Servlet Specification 3.0, Section 3.2 for details). Note that any setting other than false causes Tomcat to behave in a way that is not technically spec-compliant. -The default is false +The default is false. @@ -393,8 +394,8 @@ The value of this field must not be set unless the Context element is defined in server.xml or the docBase is not located under the Hosts appBase. -If a symbolic link is used for docBase then changes to the -symbolic link will only be effective after a Tomcat restart or +If a symbolic link is used for docBase then changes to +the symbolic link will only be effective after a Tomcat restart or by undeploying and redeploying the context. A context reload is not sufficient. @@ -475,13 +476,15 @@ will process all requests not assigned to other Contexts. This attribute must only be used when statically defining a Context in server.xml. In all other circumstances, the path will be inferred -from the filenames used for either the .xml context file or the docBase. +from the filenames used for either the .xml context file or the +docBase. Even when statically defining a Context in server.xml, this attribute -must not be set unless either the docBase is not located under the -Hosts appBase or both -deployOnStartup and autoDeploy are false. If -this rule is not followed, double deployment is likely to result. +must not be set unless either the docBase is not located +under the Hosts appBase or +both deployOnStartup and autoDeploy are +false. If this rule is not followed, double deployment is +likely to result. @@ -594,9 +597,9 @@ -Set to false if Tomcat should not read any additional request -body data for aborted uploads and instead abort the client connection. -This setting is used in the following situations: +Set to false if Tomcat should not read any +additional request body data for aborted uploads and instead abort the +client connection. This setting is used in the following situations: the size of the request body is larger than the @@ -757,7 +760,7 @@ -If true, Tomcat will prevent any file locking. +If true, Tomcat will prevent any file locking. This will significantly impact startup time of applications, but allows full webapp hot deploy and undeploy on platforms or configurations where file
[GitHub] [tomcat] markt-asf closed pull request #439: Minimal fixes to documentation of Context and Host
markt-asf closed pull request #439: URL: https://github.com/apache/tomcat/pull/439 -- 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
[GitHub] [tomcat] markt-asf commented on pull request #439: Minimal fixes to documentation of Context and Host
markt-asf commented on pull request #439: URL: https://github.com/apache/tomcat/pull/439#issuecomment-900239902 Thanks for the PR. +1 tp a new PR to make the default wording consistent. Applied manually so I could a) add a change log entry and b) broadly maintain the line length limit of 80 chars for xml files. -- 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
[tomcat] branch main updated: Improvements to documentation
This is an automated email from the ASF dual-hosted git repository. markt 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 38dbc21 Improvements to documentation 38dbc21 is described below commit 38dbc21ce7d5cb2af9780526ba26b607648e7691 Author: Mark Thomas AuthorDate: Tue Aug 17 13:05:47 2021 +0100 Improvements to documentation - Documented default for unpackWARs - Tagged all boolean values as code - Punctuation PR provided by Robert Rodewald --- webapps/docs/changelog.xml | 4 +++ webapps/docs/config/context.xml | 59 ++--- webapps/docs/config/host.xml| 48 + 3 files changed, 60 insertions(+), 51 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index db6f18a..7e63112 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,10 @@ Remove unnecessary Context settings from the examples web application. (markt) + +Document default value for unpackWARs and related clean-up. +Pull request 439 provided by Robert Rodewald. (markt) + diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index af1cb84..cc07f5e 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -183,8 +183,9 @@ Disable autoDeploy and deployOnStartup and define all Contexts in server.xml - Locate the WAR and/or directory outside of the Hosts appBase and use - a context.xml file with a docBase attribute to define it. + Locate the WAR and/or directory outside of the Hosts + appBase and use a context.xml file with a + docBase attribute to define it. @@ -263,14 +264,14 @@ -Set to true if Tomcat should automatically parse +Set to true if Tomcat should automatically parse multipart/form-data request bodies when HttpServletRequest.getPart* or HttpServletRequest.getParameter* is called, even when the target servlet isn't marked with the @MultipartConfig annotation (See Servlet Specification 3.0, Section 3.2 for details). Note that any setting other than false causes Tomcat to behave in a way that is not technically spec-compliant. -The default is false +The default is false. @@ -393,8 +394,8 @@ The value of this field must not be set unless the Context element is defined in server.xml or the docBase is not located under the Hosts appBase. -If a symbolic link is used for docBase then changes to the -symbolic link will only be effective after a Tomcat restart or +If a symbolic link is used for docBase then changes to +the symbolic link will only be effective after a Tomcat restart or by undeploying and redeploying the context. A context reload is not sufficient. @@ -475,13 +476,15 @@ will process all requests not assigned to other Contexts. This attribute must only be used when statically defining a Context in server.xml. In all other circumstances, the path will be inferred -from the filenames used for either the .xml context file or the docBase. +from the filenames used for either the .xml context file or the +docBase. Even when statically defining a Context in server.xml, this attribute -must not be set unless either the docBase is not located under the -Hosts appBase or both -deployOnStartup and autoDeploy are false. If -this rule is not followed, double deployment is likely to result. +must not be set unless either the docBase is not located +under the Hosts appBase or +both deployOnStartup and autoDeploy are +false. If this rule is not followed, double deployment is +likely to result. @@ -594,9 +597,9 @@ -Set to false if Tomcat should not read any additional request -body data for aborted uploads and instead abort the client connection. -This setting is used in the following situations: +Set to false if Tomcat should not read any +additional request body data for aborted uploads and instead abort the +client connection. This setting is used in the following situations: the size of the request body is larger than the @@ -757,7 +760,7 @@ -If true, Tomcat will prevent any file locking. +If true, Tomcat will prevent any file locking. This will significantly impact startup time of applications, but allows full webapp hot deploy and undeploy on platforms or configurations where file locking
[Bug 65479] PasswordValidationCallback does not return validation result in getResult
https://bz.apache.org/bugzilla/show_bug.cgi?id=65479 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas --- Thanks for the report and the PR. And extra thanks for including a test case. Fixed in: - 10.1.x for 10.1.0-M5 onwards - 10.0.x for 10.0.11 onwards - 9.0.x for 9.0.53 onwards - 8.5.x for 8.5.71 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
[GitHub] [tomcat] markt-asf closed pull request #438: Bugfix for 65479 - PasswordValidationCallback does not return result
markt-asf closed pull request #438: URL: https://github.com/apache/tomcat/pull/438 -- 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
[GitHub] [tomcat] markt-asf commented on pull request #438: Bugfix for 65479 - PasswordValidationCallback does not return result
markt-asf commented on pull request #438: URL: https://github.com/apache/tomcat/pull/438#issuecomment-900231508 PR applied manually so I cod add a change log entry. -- 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
[tomcat] branch 8.5.x updated: Bugfix for 65479 - PasswordValidationCallback does not return validation result in getResult
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 21ba0ac Bugfix for 65479 - PasswordValidationCallback does not return
validation result in getResult
21ba0ac is described below
commit 21ba0acc4dbba3a6266f38f6fa739bd9c8474eb1
Author: Robert Rodewald
AuthorDate: Mon Aug 2 11:27:08 2021 +0200
Bugfix for 65479 - PasswordValidationCallback does not return validation
result in getResult
---
.../apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java | 1 +
.../authenticator/TestJaspicCallbackHandlerInAuthenticator.java| 2 ++
webapps/docs/changelog.xml | 7 +++
3 files changed, 10 insertions(+)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index b1acaa5..d88ff80 100644
--- a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -79,6 +79,7 @@ public class CallbackHandlerImpl implements CallbackHandler,
Contained {
PasswordValidationCallback pvc =
(PasswordValidationCallback) callback;
principal =
container.getRealm().authenticate(pvc.getUsername(),
String.valueOf(pvc.getPassword()));
+pvc.setResult(principal != null);
subject = pvc.getSubject();
}
} else {
diff --git
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
index c164af8..bd1d412 100644
---
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
+++
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
@@ -115,9 +115,11 @@ public class TestJaspicCallbackHandlerInAuthenticator {
PasswordValidationCallback pvc1 = new
PasswordValidationCallback(clientSubject, "name1",
"password".toCharArray());
callbackHandler.handle(new Callback[] { pvc1 });
+Assert.assertTrue(pvc1.getResult());
PasswordValidationCallback pvc2 = new
PasswordValidationCallback(clientSubject, "name2",
"invalid".toCharArray());
callbackHandler.handle(new Callback[] { pvc2 });
+Assert.assertFalse(pvc2.getResult());
Set credentials = clientSubject.getPrivateCredentials();
Assert.assertTrue(credentials.size() == 1);
GenericPrincipal gp = (GenericPrincipal) credentials.iterator().next();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8572ecc..a877645 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,13 @@
body is no longer sent. This acts as an additional signal to the client
that the request experienced an error. (markt)
+
+65479: When handling requests using JASPIC authentication,
+ensure that PasswordValidationCallback.getResult() returns
+the result of the password validation rather than always returning
+false. Fixed via pull request 438 provided by
+Robert Rodewald. (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: Bugfix for 65479 - PasswordValidationCallback does not return validation result in getResult
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 537dc9a Bugfix for 65479 - PasswordValidationCallback does not return
validation result in getResult
537dc9a is described below
commit 537dc9ada185b9d14dd292e3262968d5f0353bdb
Author: Robert Rodewald
AuthorDate: Mon Aug 2 11:27:08 2021 +0200
Bugfix for 65479 - PasswordValidationCallback does not return validation
result in getResult
---
.../apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java | 1 +
.../authenticator/TestJaspicCallbackHandlerInAuthenticator.java| 2 ++
webapps/docs/changelog.xml | 7 +++
3 files changed, 10 insertions(+)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index b1acaa5..d88ff80 100644
--- a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -79,6 +79,7 @@ public class CallbackHandlerImpl implements CallbackHandler,
Contained {
PasswordValidationCallback pvc =
(PasswordValidationCallback) callback;
principal =
container.getRealm().authenticate(pvc.getUsername(),
String.valueOf(pvc.getPassword()));
+pvc.setResult(principal != null);
subject = pvc.getSubject();
}
} else {
diff --git
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
index a5f7c75..2c1bc25 100644
---
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
+++
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
@@ -115,9 +115,11 @@ public class TestJaspicCallbackHandlerInAuthenticator {
PasswordValidationCallback pvc1 = new
PasswordValidationCallback(clientSubject, "name1",
"password".toCharArray());
callbackHandler.handle(new Callback[] { pvc1 });
+Assert.assertTrue(pvc1.getResult());
PasswordValidationCallback pvc2 = new
PasswordValidationCallback(clientSubject, "name2",
"invalid".toCharArray());
callbackHandler.handle(new Callback[] { pvc2 });
+Assert.assertFalse(pvc2.getResult());
Set credentials = clientSubject.getPrivateCredentials();
Assert.assertTrue(credentials.size() == 1);
GenericPrincipal gp = (GenericPrincipal) credentials.iterator().next();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7dcf9d7..474f354 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,13 @@
body is no longer sent. This acts as an additional signal to the client
that the request experienced an error. (markt)
+
+65479: When handling requests using JASPIC authentication,
+ensure that PasswordValidationCallback.getResult() returns
+the result of the password validation rather than always returning
+false. Fixed via pull request 438 provided by
+Robert Rodewald. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Bugfix for 65479 - PasswordValidationCallback does not return validation result in getResult
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 2609815 Bugfix for 65479 - PasswordValidationCallback does not return
validation result in getResult
2609815 is described below
commit 26098150aa6c7562f9bff65effc27959aaef3648
Author: Robert Rodewald
AuthorDate: Mon Aug 2 11:27:08 2021 +0200
Bugfix for 65479 - PasswordValidationCallback does not return validation
result in getResult
---
.../apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java | 1 +
.../authenticator/TestJaspicCallbackHandlerInAuthenticator.java| 2 ++
webapps/docs/changelog.xml | 7 +++
3 files changed, 10 insertions(+)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index 59381a6..75d230f 100644
--- a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -80,6 +80,7 @@ public class CallbackHandlerImpl implements CallbackHandler,
Contained {
PasswordValidationCallback pvc =
(PasswordValidationCallback) callback;
principal =
container.getRealm().authenticate(pvc.getUsername(),
String.valueOf(pvc.getPassword()));
+pvc.setResult(principal != null);
subject = pvc.getSubject();
}
} else {
diff --git
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
index 807c49b..32d1475 100644
---
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
+++
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
@@ -116,9 +116,11 @@ public class TestJaspicCallbackHandlerInAuthenticator {
PasswordValidationCallback pvc1 = new
PasswordValidationCallback(clientSubject, "name1",
"password".toCharArray());
callbackHandler.handle(new Callback[] { pvc1 });
+Assert.assertTrue(pvc1.getResult());
PasswordValidationCallback pvc2 = new
PasswordValidationCallback(clientSubject, "name2",
"invalid".toCharArray());
callbackHandler.handle(new Callback[] { pvc2 });
+Assert.assertFalse(pvc2.getResult());
Set credentials = clientSubject.getPrivateCredentials();
Assert.assertTrue(credentials.size() == 1);
GenericPrincipal gp = (GenericPrincipal) credentials.iterator().next();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e7e1369..9162ebb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,13 @@
body is no longer sent. This acts as an additional signal to the client
that the request experienced an error. (markt)
+
+65479: When handling requests using JASPIC authentication,
+ensure that PasswordValidationCallback.getResult() returns
+the result of the password validation rather than always returning
+false. Fixed via pull request 438 provided by
+Robert Rodewald. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Bugfix for 65479 - PasswordValidationCallback does not return validation result in getResult
This is an automated email from the ASF dual-hosted git repository.
markt 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 f53fb52 Bugfix for 65479 - PasswordValidationCallback does not return
validation result in getResult
f53fb52 is described below
commit f53fb52ec1a316f5047dff52c154807bd4c11254
Author: Robert Rodewald
AuthorDate: Mon Aug 2 11:27:08 2021 +0200
Bugfix for 65479 - PasswordValidationCallback does not return validation
result in getResult
---
.../apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java | 1 +
.../authenticator/TestJaspicCallbackHandlerInAuthenticator.java| 2 ++
webapps/docs/changelog.xml | 7 +++
3 files changed, 10 insertions(+)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index 59381a6..75d230f 100644
--- a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -80,6 +80,7 @@ public class CallbackHandlerImpl implements CallbackHandler,
Contained {
PasswordValidationCallback pvc =
(PasswordValidationCallback) callback;
principal =
container.getRealm().authenticate(pvc.getUsername(),
String.valueOf(pvc.getPassword()));
+pvc.setResult(principal != null);
subject = pvc.getSubject();
}
} else {
diff --git
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
index 807c49b..32d1475 100644
---
a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
+++
b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
@@ -116,9 +116,11 @@ public class TestJaspicCallbackHandlerInAuthenticator {
PasswordValidationCallback pvc1 = new
PasswordValidationCallback(clientSubject, "name1",
"password".toCharArray());
callbackHandler.handle(new Callback[] { pvc1 });
+Assert.assertTrue(pvc1.getResult());
PasswordValidationCallback pvc2 = new
PasswordValidationCallback(clientSubject, "name2",
"invalid".toCharArray());
callbackHandler.handle(new Callback[] { pvc2 });
+Assert.assertFalse(pvc2.getResult());
Set credentials = clientSubject.getPrivateCredentials();
Assert.assertTrue(credentials.size() == 1);
GenericPrincipal gp = (GenericPrincipal) credentials.iterator().next();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5330154..db6f18a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,13 @@
body is no longer sent. This acts as an additional signal to the client
that the request experienced an error. (markt)
+
+65479: When handling requests using JASPIC authentication,
+ensure that PasswordValidationCallback.getResult() returns
+the result of the password validation rather than always returning
+false. Fixed via pull request 438 provided by
+Robert Rodewald. (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: Improve custom error page handling for committed responses
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 d8a04ad Improve custom error page handling for committed responses
d8a04ad is described below
commit d8a04ad26114cf10b675357ced82e3292822def0
Author: Mark Thomas
AuthorDate: Tue Aug 17 11:32:27 2021 +0100
Improve custom error page handling for committed responses
---
.../apache/catalina/core/StandardHostValve.java| 13 +
.../catalina/core/TestStandardHostValve.java | 58 ++
webapps/docs/changelog.xml | 8 +++
3 files changed, 79 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index 9f96e7d..f730d7c 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -382,6 +382,19 @@ final class StandardHostValve extends ValveBase {
// Response is committed - including the error page is the
// best we can do
rd.include(request.getRequest(), response.getResponse());
+
+// Ensure the combined incomplete response and error page is
+// written to the client
+try {
+response.flushBuffer();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+}
+
+// Now close immediately as an additional signal to the client
+// that something went wrong
+response.getCoyoteResponse().action(ActionCode.CLOSE_NOW,
+
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION));
} else {
// Reset the response (keeping the real error code and message)
response.resetBuffer(true);
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java
b/test/org/apache/catalina/core/TestStandardHostValve.java
index b660879..b706f41 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -130,6 +130,7 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertTrue(result.contains("Visit requestDestroyed"));
}
+
private void doTestErrorPageHandling(int error, String report)
throws Exception {
@@ -142,6 +143,49 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertEquals(report, bc.toString());
}
+
+@Test
+public void testIncompleteResponse() throws Exception {
+// Set up a container
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add the error page
+Tomcat.addServlet(ctx, "error", new ExceptionServlet());
+ctx.addServletMappingDecoded("/error", "error");
+
+// Add the error handling page
+Tomcat.addServlet(ctx, "report", new ReportServlet());
+ctx.addServletMappingDecoded("/report/*", "report");
+
+// And the handling for 500 responses
+ErrorPage errorPage500 = new ErrorPage();
+errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
+errorPage500.setLocation("/report/500");
+ctx.addErrorPage(errorPage500);
+
+// And the default error handling
+ErrorPage errorPageDefault = new ErrorPage();
+errorPageDefault.setLocation("/report/default");
+ctx.addErrorPage(errorPageDefault);
+
+tomcat.start();
+
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+Throwable t = null;
+try {
+getUrl("http://localhost:; + getPort() + "/error", bc, null);
+System.out.println(bc.toString());
+} catch (IOException ioe) {
+t = ioe;
+}
+Assert.assertNotNull(t);
+}
+
+
private static class ErrorServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -154,6 +198,20 @@ public class TestStandardHostValve extends TomcatBaseTest {
}
}
+
+private static class ExceptionServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.flushBuffer();
+throw new IOException();
+}
+}
+
+
private static class ReportServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1999b6f..8572ecc 100644
---
[tomcat] branch 9.0.x updated: Improve custom error page handling for committed responses
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 cf9abfc Improve custom error page handling for committed responses
cf9abfc is described below
commit cf9abfc1decae26e61eefd89a54317ae8696be7b
Author: Mark Thomas
AuthorDate: Tue Aug 17 11:32:27 2021 +0100
Improve custom error page handling for committed responses
---
.../apache/catalina/core/StandardHostValve.java| 13 +
.../catalina/core/TestStandardHostValve.java | 58 ++
webapps/docs/changelog.xml | 8 +++
3 files changed, 79 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index 9f96e7d..f730d7c 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -382,6 +382,19 @@ final class StandardHostValve extends ValveBase {
// Response is committed - including the error page is the
// best we can do
rd.include(request.getRequest(), response.getResponse());
+
+// Ensure the combined incomplete response and error page is
+// written to the client
+try {
+response.flushBuffer();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+}
+
+// Now close immediately as an additional signal to the client
+// that something went wrong
+response.getCoyoteResponse().action(ActionCode.CLOSE_NOW,
+
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION));
} else {
// Reset the response (keeping the real error code and message)
response.resetBuffer(true);
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java
b/test/org/apache/catalina/core/TestStandardHostValve.java
index b660879..b706f41 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -130,6 +130,7 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertTrue(result.contains("Visit requestDestroyed"));
}
+
private void doTestErrorPageHandling(int error, String report)
throws Exception {
@@ -142,6 +143,49 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertEquals(report, bc.toString());
}
+
+@Test
+public void testIncompleteResponse() throws Exception {
+// Set up a container
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add the error page
+Tomcat.addServlet(ctx, "error", new ExceptionServlet());
+ctx.addServletMappingDecoded("/error", "error");
+
+// Add the error handling page
+Tomcat.addServlet(ctx, "report", new ReportServlet());
+ctx.addServletMappingDecoded("/report/*", "report");
+
+// And the handling for 500 responses
+ErrorPage errorPage500 = new ErrorPage();
+errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
+errorPage500.setLocation("/report/500");
+ctx.addErrorPage(errorPage500);
+
+// And the default error handling
+ErrorPage errorPageDefault = new ErrorPage();
+errorPageDefault.setLocation("/report/default");
+ctx.addErrorPage(errorPageDefault);
+
+tomcat.start();
+
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+Throwable t = null;
+try {
+getUrl("http://localhost:; + getPort() + "/error", bc, null);
+System.out.println(bc.toString());
+} catch (IOException ioe) {
+t = ioe;
+}
+Assert.assertNotNull(t);
+}
+
+
private static class ErrorServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -154,6 +198,20 @@ public class TestStandardHostValve extends TomcatBaseTest {
}
}
+
+private static class ExceptionServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.flushBuffer();
+throw new IOException();
+}
+}
+
+
private static class ReportServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9ecb655..7dcf9d7 100644
---
[tomcat] branch 10.0.x updated: Improve custom error page handling for committed responses
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 38c8371 Improve custom error page handling for committed responses
38c8371 is described below
commit 38c83718a587a73a92e8400df6fd8259c0540d9d
Author: Mark Thomas
AuthorDate: Tue Aug 17 11:32:27 2021 +0100
Improve custom error page handling for committed responses
---
.../apache/catalina/core/StandardHostValve.java| 13 +
.../catalina/core/TestStandardHostValve.java | 58 ++
webapps/docs/changelog.xml | 8 +++
3 files changed, 79 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index 81cbff4..2c7004e 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -366,6 +366,19 @@ final class StandardHostValve extends ValveBase {
// Response is committed - including the error page is the
// best we can do
rd.include(request.getRequest(), response.getResponse());
+
+// Ensure the combined incomplete response and error page is
+// written to the client
+try {
+response.flushBuffer();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+}
+
+// Now close immediately as an additional signal to the client
+// that something went wrong
+response.getCoyoteResponse().action(ActionCode.CLOSE_NOW,
+
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION));
} else {
// Reset the response (keeping the real error code and message)
response.resetBuffer(true);
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 130173a..9e6927c 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -130,6 +130,7 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertTrue(result.contains("Visit requestDestroyed"));
}
+
private void doTestErrorPageHandling(int error, String report)
throws Exception {
@@ -142,6 +143,49 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertEquals(report, bc.toString());
}
+
+@Test
+public void testIncompleteResponse() throws Exception {
+// Set up a container
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add the error page
+Tomcat.addServlet(ctx, "error", new ExceptionServlet());
+ctx.addServletMappingDecoded("/error", "error");
+
+// Add the error handling page
+Tomcat.addServlet(ctx, "report", new ReportServlet());
+ctx.addServletMappingDecoded("/report/*", "report");
+
+// And the handling for 500 responses
+ErrorPage errorPage500 = new ErrorPage();
+errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
+errorPage500.setLocation("/report/500");
+ctx.addErrorPage(errorPage500);
+
+// And the default error handling
+ErrorPage errorPageDefault = new ErrorPage();
+errorPageDefault.setLocation("/report/default");
+ctx.addErrorPage(errorPageDefault);
+
+tomcat.start();
+
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+Throwable t = null;
+try {
+getUrl("http://localhost:; + getPort() + "/error", bc, null);
+System.out.println(bc.toString());
+} catch (IOException ioe) {
+t = ioe;
+}
+Assert.assertNotNull(t);
+}
+
+
private static class ErrorServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -154,6 +198,20 @@ public class TestStandardHostValve extends TomcatBaseTest {
}
}
+
+private static class ExceptionServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.flushBuffer();
+throw new IOException();
+}
+}
+
+
private static class ReportServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b035c1a..e7e1369 100644
---
[tomcat] branch main updated: Improve custom error page handling for committed responses
This is an automated email from the ASF dual-hosted git repository.
markt 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 fa0f256 Improve custom error page handling for committed responses
fa0f256 is described below
commit fa0f2567aae91a13137094ebcdb74d72b8222f3b
Author: Mark Thomas
AuthorDate: Tue Aug 17 11:32:27 2021 +0100
Improve custom error page handling for committed responses
---
.../apache/catalina/core/StandardHostValve.java| 13 +
.../catalina/core/TestStandardHostValve.java | 58 ++
webapps/docs/changelog.xml | 8 +++
3 files changed, 79 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index 81cbff4..2c7004e 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -366,6 +366,19 @@ final class StandardHostValve extends ValveBase {
// Response is committed - including the error page is the
// best we can do
rd.include(request.getRequest(), response.getResponse());
+
+// Ensure the combined incomplete response and error page is
+// written to the client
+try {
+response.flushBuffer();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+}
+
+// Now close immediately as an additional signal to the client
+// that something went wrong
+response.getCoyoteResponse().action(ActionCode.CLOSE_NOW,
+
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION));
} else {
// Reset the response (keeping the real error code and message)
response.resetBuffer(true);
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 130173a..9e6927c 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -130,6 +130,7 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertTrue(result.contains("Visit requestDestroyed"));
}
+
private void doTestErrorPageHandling(int error, String report)
throws Exception {
@@ -142,6 +143,49 @@ public class TestStandardHostValve extends TomcatBaseTest {
Assert.assertEquals(report, bc.toString());
}
+
+@Test
+public void testIncompleteResponse() throws Exception {
+// Set up a container
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add the error page
+Tomcat.addServlet(ctx, "error", new ExceptionServlet());
+ctx.addServletMappingDecoded("/error", "error");
+
+// Add the error handling page
+Tomcat.addServlet(ctx, "report", new ReportServlet());
+ctx.addServletMappingDecoded("/report/*", "report");
+
+// And the handling for 500 responses
+ErrorPage errorPage500 = new ErrorPage();
+errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
+errorPage500.setLocation("/report/500");
+ctx.addErrorPage(errorPage500);
+
+// And the default error handling
+ErrorPage errorPageDefault = new ErrorPage();
+errorPageDefault.setLocation("/report/default");
+ctx.addErrorPage(errorPageDefault);
+
+tomcat.start();
+
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+Throwable t = null;
+try {
+getUrl("http://localhost:; + getPort() + "/error", bc, null);
+System.out.println(bc.toString());
+} catch (IOException ioe) {
+t = ioe;
+}
+Assert.assertNotNull(t);
+}
+
+
private static class ErrorServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -154,6 +198,20 @@ public class TestStandardHostValve extends TomcatBaseTest {
}
}
+
+private static class ExceptionServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.flushBuffer();
+throw new IOException();
+}
+}
+
+
private static class ReportServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b29ecfd..5330154 100644
---
buildbot failure in on tomcat-8.5.x
The Buildbot has detected a new failure on builder tomcat-8.5.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-8.5.x/builds/87 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8.5-commit' triggered this build Build Source Stamp: [branch 8.5.x] 4d0518ee9525ac84407aaddcd15635dd5d323427 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #445: Improve Travis CI build Performance
markt-asf commented on pull request #445: URL: https://github.com/apache/tomcat/pull/445#issuecomment-900129327 It doesn't. It won't. -- 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
[GitHub] [tomcat] markt-asf closed pull request #445: Improve Travis CI build Performance
markt-asf closed pull request #445: URL: https://github.com/apache/tomcat/pull/445 -- 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
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690180710 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: Or maybe the ones in https://github.com/apache/tomcat/blob/main/modules/ ? I am not sure whether Ant executes those. So the cache might be useful after all. -- 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
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690178459 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: Where is it ? Did you confuse it with `build.xml` (Ant) ? -- 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
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690177540 ## File path: .travis.yml ## @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 120 "./.travis/antTest.sh" +- "./.travis/antTest.sh" Review comment: I cannot say how long it might take. It depends on how loaded the Travis VM is. Sometimes jobs take twenty something minutes, sometimes fifty something minutes... According to https://docs.travis-ci.com/user/customizing-the-build/#sts=Build%20Timeouts the max timeout for a job should be 50 mins, but it seems `travis_wait` may extend it. I cannot find any reference in their docs for its maximum. -- 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
[GitHub] [tomcat] YunLemon commented on a change in pull request #445: Improve Travis CI build Performance
YunLemon commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690172550 ## File path: .travis.yml ## @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 120 "./.travis/antTest.sh" +- "./.travis/antTest.sh" Review comment: This command will not exceed 60 mins? [https://app.travis-ci.com/github/apache/tomcat/jobs/529778525](https://app.travis-ci.com/github/apache/tomcat/jobs/529778525) -- 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
[GitHub] [tomcat] YunLemon commented on a change in pull request #445: Improve Travis CI build Performance
YunLemon commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690167527 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: I add this because I see this repo contains pom.xml -- 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
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690160756 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: Tomcat does not use Maven so I see no reason to cache this folder. ## File path: .travis.yml ## @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 120 "./.travis/antTest.sh" +- "./.travis/antTest.sh" Review comment: https://app.travis-ci.com/github/apache/tomcat/jobs/531899762 (the build for this PR) fails with `No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.`. So yes, `travis_wait` is needed! Maybe the duration should be reduced though. AFAIK Travis jobs could run for at most 50 mins but I see some which succeeded even after that... -- 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
[tomcat] branch 9.0.x updated: Correct error message (copy/paste error)
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 52603c8 Correct error message (copy/paste error)
52603c8 is described below
commit 52603c865fe88ee8c104cfb48f145259b0cb1d6b
Author: Mark Thomas
AuthorDate: Tue Aug 17 08:29:16 2021 +0100
Correct error message (copy/paste error)
---
java/org/apache/el/Messages.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/el/Messages.properties
b/java/org/apache/el/Messages.properties
index 1bf600d..c093280 100644
--- a/java/org/apache/el/Messages.properties
+++ b/java/org/apache/el/Messages.properties
@@ -20,7 +20,7 @@ error.compare=Cannot compare [{0}] to [{1}]
error.function=Problems calling function [{0}]
error.invalidMethodExpression=Not a valid method expression [{0}]
error.noFunctionMapperTarget=FunctionMapper target cannot be null
-error.noVariableMapperTarget=FunctionMapper target cannot be null
+error.noVariableMapperTarget=VariableMapper target cannot be null
error.nullLocalName=Local name cannot be null
error.nullMethod=Method cannot be null
error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
-
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: Correct error message (copy/paste error)
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 4d0518e Correct error message (copy/paste error)
4d0518e is described below
commit 4d0518ee9525ac84407aaddcd15635dd5d323427
Author: Mark Thomas
AuthorDate: Tue Aug 17 08:29:16 2021 +0100
Correct error message (copy/paste error)
---
java/org/apache/el/Messages.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/el/Messages.properties
b/java/org/apache/el/Messages.properties
index 1bf600d..c093280 100644
--- a/java/org/apache/el/Messages.properties
+++ b/java/org/apache/el/Messages.properties
@@ -20,7 +20,7 @@ error.compare=Cannot compare [{0}] to [{1}]
error.function=Problems calling function [{0}]
error.invalidMethodExpression=Not a valid method expression [{0}]
error.noFunctionMapperTarget=FunctionMapper target cannot be null
-error.noVariableMapperTarget=FunctionMapper target cannot be null
+error.noVariableMapperTarget=VariableMapper target cannot be null
error.nullLocalName=Local name cannot be null
error.nullMethod=Method cannot be null
error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Correct error message (copy/paste error)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 9e8e981 Correct error message (copy/paste error)
9e8e981 is described below
commit 9e8e981311c7f02486da855cd30ad9367ff60933
Author: Mark Thomas
AuthorDate: Tue Aug 17 08:29:16 2021 +0100
Correct error message (copy/paste error)
---
java/org/apache/el/Messages.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/el/Messages.properties
b/java/org/apache/el/Messages.properties
index 1bf600d..c093280 100644
--- a/java/org/apache/el/Messages.properties
+++ b/java/org/apache/el/Messages.properties
@@ -20,7 +20,7 @@ error.compare=Cannot compare [{0}] to [{1}]
error.function=Problems calling function [{0}]
error.invalidMethodExpression=Not a valid method expression [{0}]
error.noFunctionMapperTarget=FunctionMapper target cannot be null
-error.noVariableMapperTarget=FunctionMapper target cannot be null
+error.noVariableMapperTarget=VariableMapper target cannot be null
error.nullLocalName=Local name cannot be null
error.nullMethod=Method cannot be null
error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Correct error message (copy/paste error)
This is an automated email from the ASF dual-hosted git repository.
markt 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 1da1552 Correct error message (copy/paste error)
1da1552 is described below
commit 1da1552abc56a46e6c46113f42fa2624894e2dc5
Author: Mark Thomas
AuthorDate: Tue Aug 17 08:29:16 2021 +0100
Correct error message (copy/paste error)
---
java/org/apache/el/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/el/LocalStrings.properties
b/java/org/apache/el/LocalStrings.properties
index d9f5503..3ee497d 100644
--- a/java/org/apache/el/LocalStrings.properties
+++ b/java/org/apache/el/LocalStrings.properties
@@ -22,7 +22,7 @@ error.compare=Cannot compare [{0}] to [{1}]
error.function=Problems calling function [{0}]
error.invalidMethodExpression=Not a valid method expression [{0}]
error.noFunctionMapperTarget=FunctionMapper target cannot be null
-error.noVariableMapperTarget=FunctionMapper target cannot be null
+error.noVariableMapperTarget=VariableMapper target cannot be null
error.nullLocalName=Local name cannot be null
error.nullMethod=Method cannot be null
error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.5.70 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.70. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and Java Authentication Service Provider Interface for Containers technologies. Apache Tomcat 8.5.70 is a bugfix and feature release. The notable changes compared to 8.5.69 include: - Correct a regression in the previous release in the HTTP/2 flow control window management along with additional improvements to HTTP/2 flow control - Make the CorsFilter simpler to extend - To avoid unnecessary cache revalidation, do not add an HTTP Expires header when setting adding an HTTP header of CacheControl: private Along with lots of other bug fixes and improvements. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r49535 - /release/tomcat/tomcat-8/v8.5.69/
Author: markt Date: Tue Aug 17 07:12:19 2021 New Revision: 49535 Log: Drop 8.5.69 from the mirror network Removed: release/tomcat/tomcat-8/v8.5.69/ - 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: Add 8.5.70 release date
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 7f56ef9 Add 8.5.70 release date 7f56ef9 is described below commit 7f56ef9b174b600ab77d687e6782c5a403fb41a8 Author: Mark Thomas AuthorDate: Tue Aug 17 08:11:08 2021 +0100 Add 8.5.70 release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index bb01b7a..1999b6f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -133,7 +133,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1892397 - in /tomcat/site/trunk: docs/ xdocs/
Author: markt Date: Tue Aug 17 07:10:31 2021 New Revision: 1892397 URL: http://svn.apache.org/viewvc?rev=1892397=rev Log: Update site for release of Apache Tomcat 8.5.70 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-80.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-85.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1892397=1892396=1892397=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Aug 17 07:10:31 2021 @@ -74,8 +74,8 @@ Latest Stable 8.5.x Release -2021-07-05 -8.5.69 +2021-08-16 +8.5.70 Modified: tomcat/site/trunk/docs/download-80.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1892397=1892396=1892397=diff == --- tomcat/site/trunk/docs/download-80.html (original) +++ tomcat/site/trunk/docs/download-80.html Tue Aug 17 07:10:31 2021 @@ -12,7 +12,7 @@ Quick Navigation -[define v]8.5.69[end] +[define v]8.5.70[end] https://downloads.apache.org/tomcat/tomcat-8/KEYS;>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1892397=1892396=1892397=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Aug 17 07:10:31 2021 @@ -36,6 +36,28 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2021-08-16 Tomcat 8.5.70 Released + +The Apache Tomcat Project is proud to announce the release of version 8.5.70 +of Apache Tomcat. This release implements specifications that are part of the +Java EE 7 platform. The notable changes compared to 8.5.69 include: + +Correct a regression in the previous release in the HTTP/2 flow control +window management along with additional improvements to HTTP/2 flow control + +Make the CorsFilter simpler to extend +To avoid unnecessary cache revalidation, do not add an HTTP Expires header +when setting adding an HTTP header of CacheControl: private + + +Full details of these changes, and all the other changes, are available in the +Tomcat 8.5 +changelog. + + + +https://tomcat.apache.org/download-80.cgi;>Download + 2021-08-06 Tomcat 9.0.52 Released The Apache Tomcat Project is proud to announce the release of version 9.0.52 @@ -121,28 +143,6 @@ Full details of these changes, and all t https://tomcat.apache.org/download-10.cgi;>Download -2021-07-05 Tomcat 8.5.69 Released - -The Apache Tomcat Project is proud to announce the release of version 8.5.69 -of Apache Tomcat. This release implements specifications that are part of the -Java EE 7 platform. The notable changes compared to 8.5.68 include: - -Re-work the HTTP/2 overhead protection to reduce the likelihood of -false positives. Note that the default overheadCountFactor has changed -from 1 to 10 and that the useful range is now 0 to ~20. -Fix regressions in JSP compilation in the previous release. -Improve HTTP header parsing to ignore empty elements in 1#token -values, as per RFC 7230 section 7. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 8.5 -changelog. - - - -https://tomcat.apache.org/download-80.cgi;>Download - 2021-06-04 Tomcat Native 1.2.30 Released The Apache Tomcat Project is proud to announce the release of version 1.2.30 of Modified: tomcat/site/trunk/docs/migration-85.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1892397=1892396=1892397=diff == --- tomcat/site/trunk/docs/migration-85.html (original) +++ tomcat/site/trunk/docs/migration-85.html Tue Aug 17 07:10:31 2021 @@ -336,8 +336,9 @@ of Apache Tomcat. 8.5.64 8.5.65 8.5.66 -8.5.66 -8.5.66 +8.5.68 +8.5.69 +8.5.66 , new version: 8.5.0 @@ -393,7 +394,9 @@ of Apache Tomcat. 8.5.64 8.5.65 8.5.66 -8.5.68 +8.5.68 +8.5.69 +8.5.70 trunk (unreleased) Modified: tomcat/site/trunk/docs/oldnews.html URL:
svn commit: r1892396 - in /tomcat/site/trunk: ./ docs/tomcat-8.5-doc/ docs/tomcat-8.5-doc/annotationapi/ docs/tomcat-8.5-doc/annotationapi/javax/annotation/ docs/tomcat-8.5-doc/annotationapi/javax/ann
Author: markt Date: Tue Aug 17 07:08:02 2021 New Revision: 1892396 URL: http://svn.apache.org/viewvc?rev=1892396=rev Log: Update docs for 8.5.70 release [This commit notification would consist of 975 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #445: Improve Travis CI build Performance
markt-asf commented on pull request #445: URL: https://github.com/apache/tomcat/pull/445#issuecomment-900037585 The use of `travis_wait` is required. -- 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
