[Bug 64398] New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398 Frank Erens changed: What|Removed |Added CC||frank.er...@androme.be -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64398] New: New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398
Bug ID: 64398
Summary: New "default values in property value expressions"
syntax breaks Log4j2's "property substitution" syntax
Product: Tomcat 8
Version: 8.5.54
Hardware: PC
OS: FreeBSD
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: frank.er...@androme.be
Target Milestone:
In Tomcat 8.5.54, the following commit was added:
https://github.com/apache/tomcat/commit/dcf3193bd6a293492fb7efe756827aece33f4a51
This uses the syntax ${foo:bar} to mean "If 'foo' is undefined, replace with
'bar'"
Log4j2 has a feature called "property substitution":
http://logging.apache.org/log4j/2.x/manual/configuration.html#PropertySubstitution
http://logging.apache.org/log4j/log4j-2.12.1/manual/lookups.html
For example, ${env:fooConfDir} is replaced with the value of the environment
variable "fooConfDir".
Due to the commit in 8.5.54, ${env:fooConfDir} instead now gets replaced with
the literal value "fooConfDir" (assuming no variable named "env" is defined).
In our case, we have the following lines in our web.xml (redacted):
log4jConfiguration
file://${env:fooConfDir}/foo/log4j2.xml
As of Tomcat 8.5.54, Log4j fails to find its configuration file with the
following error:
ERROR StatusLogger Unable to access file://fooConfDir/foo/log4j2.xml
java.net.UnknownHostException: fooConfDir
It appears that the new syntax linked above interferes with Log4j's property
substitution.
Recommend changing the "default" syntax to ${foo:-bar} as this is also the
syntax used by Log4j:
https://logging.apache.org/log4j/2.x/manual/configuration.html#DefaultProperties
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64398] New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398 --- Comment #1 from Mark Thomas --- I don't like that the change in default format isn't backwards compatible but given the popularity of log4j2 and that the Tomcat feature is relatively new, I think this is the right thing to do. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore
https://bz.apache.org/bugzilla/show_bug.cgi?id=64394 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- Why? System administrators are going to have to configure the rest of the TLS connector in server.xml. Including the trust store in that is trivial. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore
https://bz.apache.org/bugzilla/show_bug.cgi?id=64394 --- Comment #2 from christoph.vonwitt...@bv.aok.de --- 1) many people do not know that a Java Option to trust certificates from the windows truststore exist 2) On every Tomcat Upgrade (Uninstall / Install again) all Java Options are lost because they are saved in the registry 3) The use of the java truststore is not suitable in larger corporate environments because you have to manually add all your certificates manually (on each server). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64395] Windows Installer should offer an option to select a service account
https://bz.apache.org/bugzilla/show_bug.cgi?id=64395 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- (In reply to Christoph.vonWittich from comment #0) > The current installer installs the Tomcat Service by using the LocalSystem > account. > This account is high privilege account and should not be used for production > webservers. This is not correct. As of the switch to Commons Daemon 1.2.0 around the middle of last year, Tomcat uses "Local Service", not "Local System". This can still be changed, e.g. via Tomact9w.exe, if required. We previously looked at providing an option to select a user in the installer under bug 55969. The conclusion then was that the work required did not justify the benefit given the change to "Local Service". That doesn't mean that a patch to provide that feature would be rejected - quite the opposite - just that the committers are likely to have higher priorities. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore
https://bz.apache.org/bugzilla/show_bug.cgi?id=64394 --- Comment #3 from christoph.vonwitt...@bv.aok.de --- >Including the trust store in that is trivial. Using the Windows Truststore is trivial as it already contains all certificates we need. And it is updated automatically with Active Directory GPOs. Using a seperate java truststore would mean I have to manage this extra truststore and deploy it to many servers manually. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64398] New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398 --- Comment #2 from Remy Maucherat --- Ok, this is unfortunate. Or maybe this feature could be skipped in some cases [with an option, skip by default], like for web.xml and the user descriptors ? To be honest, it is rather bad to do any property replacement at all there as it makes the webapp non portable. If it is kept, I don't really like ":-" as it's not intuitive, is "::" possible instead ? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64395] Windows Installer should offer an option to select a service account
https://bz.apache.org/bugzilla/show_bug.cgi?id=64395 --- Comment #2 from christoph.vonwitt...@bv.aok.de --- >The conclusion then was that the work required did not justify the benefit >given the >change to "Local Service". Not when you just have to manage a single instance of Tomcat... I have to manage at least 30, and it takes a long time to update each of them as every update is a complete reinstall and all settings like directory permissions, java options, jdbc drivers, etc. are lost - even when you select "Keep my files". -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64398] New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398
--- Comment #3 from Frank Erens ---
${variable:-default} syntax is also used by bash/sh:
https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64398] New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398 --- Comment #4 from Michael Osipov --- I would also recommend to use :-. This shell/bsah default. Logback uses the same style. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64395] Windows Installer should offer an option to select a service account
https://bz.apache.org/bugzilla/show_bug.cgi?id=64395 --- Comment #3 from Mark Thomas --- You would be better off not using the installer and using separate CATALINA_HOME/CATALINA_BASE. Upgrades would then be: - unpack new binary - stop service - modify service to point to new binary - start service There is a (very) brief outline here: https://tomcat.apache.org/tomcat-10.0-doc/windows-service-howto.html#Multiple_Instances The users mailing list is the place to discuss this further if this is of interest. There are probably things we can do in terms of script support to make this even smoother. Back to the original enhancement request... Patches are welcome but if you plan to wait for one of the Tomcat committers to write the patch I think you'll have a long wait. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore
https://bz.apache.org/bugzilla/show_bug.cgi?id=64394 --- Comment #4 from Mark Thomas --- 1. Arguably not Tomcat's problem. That said, adding something to the TLS section of the HTTP/1.1 connector docs for truststoreType (and certificateKeystoreType) and/or the SSL How-To would probably reach a wider audience. 2. That is an issue with the upgrade process. See https://bz.apache.org/bugzilla/show_bug.cgi?id=64395#c3 for better ways to handle that. 3. No-one is suggesting that you use the Java trust store When you add the TLS connector configuration to server.xml (which you are going to have to do anyway), simply use: truststoreType="Windows-ROOT" and don't set truststoreFile This has the advantage that the complete configuration for the TLS connector is explicitly defined in server.xml rather that partly in server.xml and partly via system properties. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore
https://bz.apache.org/bugzilla/show_bug.cgi?id=64394 --- Comment #5 from christoph.vonwitt...@bv.aok.de --- > When you add the TLS connector configuration to server.xml (which you are > going to have to do anyway), simply use: > > truststoreType="Windows-ROOT" > > and don't set truststoreFile Interesting... A hint in the documentation that this value is possible here would be helpful. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore
https://bz.apache.org/bugzilla/show_bug.cgi?id=64394 --- Comment #6 from Michael Osipov --- (In reply to Christoph.vonWittich from comment #2) > 3) The use of the java truststore is not suitable in larger corporate > environments because you have to manually add all your certificates manually > (on each server). I concur here. At my company, Java is prepackaged for Windows and rolled out globally with out Root and Intermediate CAs. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Import German updates from POEditor
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 843eadc24fdefe5fc423a9748cf46c280ef5d3e3
Author: Mark Thomas
AuthorDate: Wed Apr 29 14:08:52 2020 +0100
Import German updates from POEditor
---
java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index bc7f582..591e5e9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -28,7 +28,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von
jsp:plugin sein
-jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
+jsp.error.file.not.found=Datei [{0}] nicht gefunden
jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
jsp.error.internal.unexpectedNodeType=Unerwarteter Knotentyp
jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8f9a752..d69c248 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,6 +208,10 @@
Improve the quality of the Japanese translations provided with Apache
Tomcat. Includes contributions from Yoshy. (markt)
+
+Improve the quality of the Germasn translations provided with Apache
+Tomcat. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (d137e71 -> a07864f)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d137e71 Fix IDE nag new ba103cb Import Japanese updates from POEditor new 843eadc Import German updates from POEditor new a07864f Update to Tomcat Native 1.2.24 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default| 10 +- java/org/apache/catalina/core/LocalStrings_ja.properties| 1 - java/org/apache/catalina/util/LocalStrings_ja.properties| 2 +- java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +- webapps/docs/changelog.xml | 12 5 files changed, 19 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Update to Tomcat Native 1.2.24
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a07864fd31a3ffb871aa5c412d7cbb07ac886b7c
Author: Mark Thomas
AuthorDate: Thu Apr 30 14:52:17 2020 +0100
Update to Tomcat Native 1.2.24
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 6 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d73c8c6..928ba87 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -145,19 +145,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.23
+tomcat-native.version=1.2.24
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=b5d91d709241fea5f18fbaf2eb1dbad3c3014309ac72dfc10c0eb7c2f926a8e37a4c326ce251552bbd2b1f15b86c84ae72c33a259cc051765ab4322c91b5721b
+tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.04
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d69c248..e851a9a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,11 +208,15 @@
Improve the quality of the Japanese translations provided with Apache
Tomcat. Includes contributions from Yoshy. (markt)
+
Improve the quality of the Germasn translations provided with Apache
Tomcat. (markt)
-
+
+Update the packaged version of the Tomcat Native Library to 1.2.24.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Import Japanese updates from POEditor
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ba103cb46a72cec66d5666f500f409ac3b42cfe9
Author: Mark Thomas
AuthorDate: Wed Apr 29 14:05:57 2020 +0100
Import Japanese updates from POEditor
---
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/util/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 33b3b20..9cf4d84 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -70,7 +70,6 @@ aprListener.aprDestroy=APRベースのApache Tomcatネイティブライブラ
aprListener.aprInit=商用環境に最適な性能を発揮する APR ベースの Tomcat ネイティブライブラリが
java.library.path [{0}] に存在しません。
aprListener.aprInitDebug=APRベースのApache Tomcatネイティブライブラリは、java.library.path
[{1}]上の名前[{0}]を使用して見つかりませんでした。 報告されたエラーは[{2}]
aprListener.aprInitError=APRベースのApache Tomcatネイティブライブラリをロードできませんでした。
報告されたエラーは[{0}]でした
-aprListener.config=APR/OpenSSL設定：useAprConnector [{0}]、useOpenSSL [{1}]
aprListener.currentFIPSMode=現在のFIPSモード：[{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListenerは強制的にFIPSモードに入るように設定されていますが、ライブラリはすでにFIPSモードになっています[{0}]
aprListener.flags=APR機能：IPv6 [{0}]、sendfile {1}]、受け入れフィルタ[{2}]、ランダム[{3}]
diff --git a/java/org/apache/catalina/util/LocalStrings_ja.properties
b/java/org/apache/catalina/util/LocalStrings_ja.properties
index 9bb46e4..3b3e6b6 100644
--- a/java/org/apache/catalina/util/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ja.properties
@@ -47,7 +47,7 @@ parameterMap.locked=ロックされたParameterMapは変更が許されません
resourceSet.locked=ロックされたResourceSetは変更が許されません
-sessionIdGeneratorBase.createRandom=セッション ID を生成するための SecureRandom インスタンスの作成に
[{1}] ミリ秒かかりました。アルゴリズムは [{1}] です。
+sessionIdGeneratorBase.createRandom=セッション ID を生成するための SecureRandom インスタンスの作成に
[{1}] ミリ秒かかりました。アルゴリズムは [{0}] です。
sessionIdGeneratorBase.random=クラス [{0}] の乱数発生器の初期化の例外です
sessionIdGeneratorBase.randomAlgorithm=アルゴリズム[{0}]を使用して乱数ジェネレータを初期化する際の例外
sessionIdGeneratorBase.randomProvider=プロバイダ[{0}]を使用して乱数ジェネレータを初期化中に例外が発生しました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61129f8..8f9a752 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -205,6 +205,10 @@
Improve the quality and expand the coverage of the French translations
provided with Apache Tomcat. (remm)
+
+Improve the quality of the Japanese translations provided with Apache
+Tomcat. Includes contributions from Yoshy. (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 Tomcat Native 1.2.24
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 506d596 Update to Tomcat Native 1.2.24
506d596 is described below
commit 506d5969b7e65156f439e83c438f24f80dfb612a
Author: Mark Thomas
AuthorDate: Thu Apr 30 14:52:17 2020 +0100
Update to Tomcat Native 1.2.24
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4dd772b..a2230ea 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -145,19 +145,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.23
+tomcat-native.version=1.2.24
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=b5d91d709241fea5f18fbaf2eb1dbad3c3014309ac72dfc10c0eb7c2f926a8e37a4c326ce251552bbd2b1f15b86c84ae72c33a259cc051765ab4322c91b5721b
+tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.04
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a62169f..5642724 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -177,6 +177,10 @@
Tomcat. Contributions provided by winsonzhao, ZhangJieWen and Lee
Yazhou. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.24.
+(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: Update to Tomcat Native 1.2.24
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 42e0a8f Update to Tomcat Native 1.2.24
42e0a8f is described below
commit 42e0a8f16fcada3a9525a93cb1b02219d04e922e
Author: Mark Thomas
AuthorDate: Thu Apr 30 14:52:17 2020 +0100
Update to Tomcat Native 1.2.24
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4288056..f53c4f1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -149,19 +149,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.23
+tomcat-native.version=1.2.24
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=b5d91d709241fea5f18fbaf2eb1dbad3c3014309ac72dfc10c0eb7c2f926a8e37a4c326ce251552bbd2b1f15b86c84ae72c33a259cc051765ab4322c91b5721b
+tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.04
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2dd9cf1..0b40f5d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,10 @@
Tomcat. Contributions provided by winsonzhao, ZhangJieWen and Lee
Yazhou. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.24.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Update to Tomcat Native 1.2.24
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 6d8c45e Update to Tomcat Native 1.2.24
6d8c45e is described below
commit 6d8c45e5fbdd9c5ed0ad58112e6cacea3c7eddb5
Author: Mark Thomas
AuthorDate: Thu Apr 30 14:52:17 2020 +0100
Update to Tomcat Native 1.2.24
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0ae55fe..9d59f56 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -182,19 +182,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.23
+tomcat-native.version=1.2.24
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=b5d91d709241fea5f18fbaf2eb1dbad3c3014309ac72dfc10c0eb7c2f926a8e37a4c326ce251552bbd2b1f15b86c84ae72c33a259cc051765ab4322c91b5721b
+tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.04
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 938bc08..2596f72 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -216,6 +216,10 @@
Refactor bulk addition to collections to use addAll()
rather than a loop. Pull request provided by Lars Grefer. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.24.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1877208 - in /tomcat/site/trunk/docs/native-doc: ./ miscellaneous/ news/
Author: markt Date: Thu Apr 30 14:03:08 2020 New Revision: 1877208 URL: http://svn.apache.org/viewvc?rev=1877208&view=rev Log: Update Tomcat Native docs for 1.2.24 release Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/news/2008.html tomcat/site/trunk/docs/native-doc/news/2009.html tomcat/site/trunk/docs/native-doc/news/2010.html tomcat/site/trunk/docs/native-doc/news/2011.html tomcat/site/trunk/docs/native-doc/news/2012.html tomcat/site/trunk/docs/native-doc/news/2013.html tomcat/site/trunk/docs/native-doc/news/2014.html tomcat/site/trunk/docs/native-doc/news/2015.html tomcat/site/trunk/docs/native-doc/news/2016.html tomcat/site/trunk/docs/native-doc/news/2017.html tomcat/site/trunk/docs/native-doc/news/2018.html tomcat/site/trunk/docs/native-doc/news/2019.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1877208&r1=1877207&r2=1877208&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Thu Apr 30 14:03:08 2020 @@ -1,5 +1,5 @@ -Apache Tomcat Native Library - Documentation Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native LibraryLinksDocs HomeMiscellaneous DocumentationChangelogNews20182017201620152014201320122011201020092008Documentation IndexIntroduction +Apache Tomcat Native Library - Documentation Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native LibraryLinksDocs HomeMiscellaneous DocumentationChangelogNews2020201920182017201620152014201320122011201020092008Documentation IndexIntroduction The Apache Tomcat Native Library is an optional component for use with @@ -53,9 +53,9 @@ list of changes. - In Debian based Linux those dependencies could be installed by something like: + In debian based Linux those dependencies could be installed by something like: -apt-get install libapr1-dev libssl-dev +apt-get install libapr1.0-dev libssl-dev In rpm based Linux those dependencies could be installed by something like: @@ -180,5 +180,5 @@ INFO: Initializing Coyote HTTP/1.1 on ht -Copyright © 2008-2019, The Apache Software Foundation +Copyright © 2008-2020, The Apache Software Foundation \ No newline at end of file Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1877208&r1=1877207&r2=1877208&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Thu Apr 30 14:03:08 2020 @@ -1,8 +1,43 @@ -The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous Documentation LinksDocs HomeMiscellaneous DocumentationChangelogNews2017201620152014201320122011201020092008Preface +The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous Documentation LinksDocs HomeMiscellaneous DocumentationChangelogNews2020201920182017201620152014201320122011201020092008Preface This is the Changelog for Tomcat Native 1.2. +Changes in 1.2.24 + + + http://issues.apache.org/bugzilla/show_bug.cgi?id=63671";>63671: libtcnative does not compile with OpenSSL < 1.1.0 + and APR w/o threading support. (michaelo) + + + Correct configure message for OpenSSL libdir. (michaelo) + + + http://issues.apache.org/bugzilla/show_bug.cgi?id=64260";>64260: Clean up install target. (michaelo) + + + http://issues.apache.org/bugzilla/show_bug.cgi?id=64315";>64315: configure output for OpenSSL wrong/incomplete sometimes. + (michaelo) + + + Drop obsolete build time workarounds for HP-UX. (michaelo) + + + Add support for FreeBSD's pthread_getthreadid_np() in our + ssl_thread_id(void). (michaelo) + + + http://issues.apache.org/bugzilla/show_bug.cgi?id=63701";>63701: Use new OpenSSL initialisation process when building with + OpenSSL 1.1.0 onwards. (mturk) + + + Introduce tcn_get_thread_id(void) to reduce code duplication. (michaelo) + + + Fix linking against OpenSSL in non-standard locations on FreeBSD. + (michaelo) + + Changes in 1.2.23 @@ -442,5 +477,5 @@ Please see the 1.1.x changelog. -
svn commit: r1877209 - /tomcat/site/trunk/docs/native-doc/news/2020.html
Author: markt Date: Thu Apr 30 14:04:07 2020 New Revision: 1877209 URL: http://svn.apache.org/viewvc?rev=1877209&view=rev Log: Add new file Added: tomcat/site/trunk/docs/native-doc/news/2020.html (with props) Added: tomcat/site/trunk/docs/native-doc/news/2020.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2020.html?rev=1877209&view=auto == --- tomcat/site/trunk/docs/native-doc/news/2020.html (added) +++ tomcat/site/trunk/docs/native-doc/news/2020.html Thu Apr 30 14:04:07 2020 @@ -0,0 +1,10 @@ + +The Apache Tomcat Native - News - 2020 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - NewsLinksDocs Home Miscellaneous DocumentationChangelogNews20172016201520142013201220112010200920082020 News and Status2020 News & Status + 29 Apr 2020 - TC-Native-1.2.24 released + The Apache Tomcat team is proud to announce the immediate availability of + Tomcat Native 1.2.24. This is a bugfix release. + + + +Copyright © 2008-2020, The Apache Software Foundation + \ No newline at end of file Propchange: tomcat/site/trunk/docs/native-doc/news/2020.html -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1877210 - in /tomcat/site/trunk/docs/native-doc: ./ miscellaneous/ news/
Author: markt Date: Thu Apr 30 14:10:24 2020 New Revision: 1877210 URL: http://svn.apache.org/viewvc?rev=1877210&view=rev Log: Update index page. Add missing years in navigation bar for news pages Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/news/2008.html tomcat/site/trunk/docs/native-doc/news/2009.html tomcat/site/trunk/docs/native-doc/news/2010.html tomcat/site/trunk/docs/native-doc/news/2011.html tomcat/site/trunk/docs/native-doc/news/2012.html tomcat/site/trunk/docs/native-doc/news/2013.html tomcat/site/trunk/docs/native-doc/news/2014.html tomcat/site/trunk/docs/native-doc/news/2015.html tomcat/site/trunk/docs/native-doc/news/2016.html tomcat/site/trunk/docs/native-doc/news/2017.html tomcat/site/trunk/docs/native-doc/news/2018.html tomcat/site/trunk/docs/native-doc/news/2019.html tomcat/site/trunk/docs/native-doc/news/2020.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1877210&r1=1877209&r2=1877210&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Thu Apr 30 14:10:24 2020 @@ -27,10 +27,10 @@ Headlines -07 Jul 2019 - TC-Native-1.2.23 +29 Apr 2020 - TC-Native-1.2.24 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 1.2.23 Stable. +Tomcat Native 1.2.24 Stable. The sources and the binaries for selected platforms are available from the Download page. Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1877210&r1=1877209&r2=1877210&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Thu Apr 30 14:10:24 2020 @@ -31,7 +31,8 @@ OpenSSL 1.1.0 onwards. (mturk) - Introduce tcn_get_thread_id(void) to reduce code duplication. (michaelo) + http://issues.apache.org/bugzilla/show_bug.cgi?id=64316";>64316: Introduce tcn_get_thread_id(void) to reduce code + duplication. (michaelo) Fix linking against OpenSSL in non-standard locations on FreeBSD. @@ -478,4 +479,4 @@ changelog. Copyright © 2008-2020, The Apache Software Foundation - \ No newline at end of file + Modified: tomcat/site/trunk/docs/native-doc/news/2008.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2008.html?rev=1877210&r1=1877209&r2=1877210&view=diff == --- tomcat/site/trunk/docs/native-doc/news/2008.html (original) +++ tomcat/site/trunk/docs/native-doc/news/2008.html Thu Apr 30 14:10:24 2020 @@ -1,5 +1,5 @@ -The Apache Tomcat Native - News - 2008 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - NewsLinksDocs Home Miscellaneous DocumentationChangelogNews20172016201520142013201220112010200920082008 News and Status2008 News & Status +The Apache Tomcat Native - News - 2008 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - NewsLinksDocs Home Miscellaneous DocumentationChangelogNews20202019201820172016201520142013201220112010200920082008 News and Status2008 News & Status 18 November - TC-Native-1.1.16 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.16. This is a stable release adding some bug fixes. Modified: tomcat/site/trunk/docs/native-doc/news/2009.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2009.html?rev=1877210&r1=1877209&r2=1877210&view=diff == --- tomcat/site/trunk/docs/native-doc/news/2009.html (original) +++ tomcat/site/trunk/docs/native-doc/news/2009.html Thu Apr 30 14:10:24 2020 @@ -1,5 +1,5 @@ -The Apache Tomcat Native - News - 2009 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - NewsLinksDocs Home Miscellaneous DocumentationChangelogNews20172016201520142013201220112010200920082009 News and Status2009 News & Status +The Apache Tomcat Native - News - 2009 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - NewsLinksDocs Home Miscellaneous DocumentationChangelogNews20202019201820172016201520142013201220112010200920082009 News and Status2009 News & Status 23 November - TC-Native-1.1.
svn commit: r1877211 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews-2019.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews-2019.xml
Author: markt Date: Thu Apr 30 14:16:22 2020 New Revision: 1877211 URL: http://svn.apache.org/viewvc?rev=1877211&view=rev Log: Update site for release of Apache Tomcat Native 1.2.24 Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews-2019.html tomcat/site/trunk/xdocs/download-native.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews-2019.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1877211&r1=1877210&r2=1877211&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Thu Apr 30 14:16:22 2020 @@ -49,22 +49,22 @@ Source (please choose the correct format for your platform) - -Native 1.2.23 Source Release tar.gz (e.g. Unix, Linux, Mac OS) + +Native 1.2.24 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/source/tomcat-native-1.2.23-src.tar.gz.asc";>PGP], -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/source/tomcat-native-1.2.23-src.tar.gz.sha512";>SHA512] +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/source/tomcat-native-1.2.24-src.tar.gz.asc";>PGP], +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/source/tomcat-native-1.2.24-src.tar.gz.sha512";>SHA512] - -Native 1.2.23 Source Release zip (e.g. Windows) + +Native 1.2.24 Source Release zip (e.g. Windows) -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/source/tomcat-native-1.2.23-win32-src.zip.asc";>PGP], -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/source/tomcat-native-1.2.23-win32-src.zip.sha512";>SHA512] +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/source/tomcat-native-1.2.24-win32-src.zip.asc";>PGP], +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/source/tomcat-native-1.2.24-win32-src.zip.sha512";>SHA512] @@ -73,7 +73,7 @@ You can find binaries release too. You may download them from - HERE + HERE @@ -91,22 +91,22 @@ Binaries for Microsoft Windows built with OpenSSL 1.1.1c - - Native 1.2.23 Windows Binaries zip (recommended) + + Native 1.2.24 Windows Binaries zip (recommended) - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/binaries/tomcat-native-1.2.23-openssl-1.1.1c-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/binaries/tomcat-native-1.2.23-openssl-1.1.1c-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/binaries/tomcat-native-1.2.24-openssl-1.1.1g-win32-bin.zip.asc";>PGP], + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/binaries/tomcat-native-1.2.24-openssl-1.1.1g-win32-bin.zip.sha512";>SHA512] - - Native 1.2.23 Windows OCSP-enabled Binaries zip + + Native 1.2.24 Windows OCSP-enabled Binaries zip - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/binaries/tomcat-native-1.2.23-openssl-1.1.1c-ocsp-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.23/binaries/tomcat-native-1.2.23-openssl-1.1.1c-ocsp-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/binaries/tomcat-native-1.2.24-openssl-1.1.1g-ocsp-win32-bin.zip.asc";>PGP], + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.24/binaries/tomcat-native-1.2.24-openssl-1.1.1g-ocsp-win32-bin.zip.sha512";>SHA512] Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1877211&r1=1877210&r2=1877211&view=diff == --- tomcat/site/trunk/
[ANN] Apache Tomcat Native 1.2.24 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 1.2.24 stable. The key features of this release are: - Improvements to the build system - Update Windows binaries to APR 1.7.0 and OpenSSL 1.1.1g Please refer to the change log for the complete list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi The Apache Tomcat Native Library provides portable API for features not found in contemporary JDK's. It uses Apache Portable Runtime as operating system abstraction layer and OpenSSL for SSL networking and allows optimal performance in production environments. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-85-trunk
The Buildbot has detected a build exception on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2288 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 42e0a8f16fcada3a9525a93cb1b02219d04e922e Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1689 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 6d8c45e5fbdd9c5ed0ad58112e6cacea3c7eddb5 Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: 64398: Change default value separator for property replacement
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 90b8ff2 64398: Change default value separator for property replacement
90b8ff2 is described below
commit 90b8ff2f330973bbe54dbbe3d702b3111bb781fc
Author: remm
AuthorDate: Thu Apr 30 16:37:52 2020 +0200
64398: Change default value separator for property replacement
Due to conflicts, the syntax is now ${name:-default}.
---
java/org/apache/tomcat/util/IntrospectionUtils.java | 4 ++--
test/org/apache/tomcat/util/TestIntrospectionUtils.java | 8
webapps/docs/changelog.xml | 5 +
webapps/docs/config/systemprops.xml | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index aa2f40c..eef8980 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -268,9 +268,9 @@ public final class IntrospectionUtils {
String v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
// {name:default}
-int col = n.indexOf(':');
+int col = n.indexOf(":-");
if (col != -1) {
-String dV = n.substring(col+1);
+String dV = n.substring(col + 2);
n = n.substring(0, col);
v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
diff --git a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
index ef27174..ed9fe39 100644
--- a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
+++ b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
@@ -130,16 +130,16 @@ public class TestIntrospectionUtils {
Assert.assertEquals("abcvalue1xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
-properties.setProperty("prop_with:colon", "value2");
+properties.setProperty("prop_with:-colon", "value2");
Assert.assertEquals("value2", IntrospectionUtils.replaceProperties(
-"${prop_with:colon}", properties, null, null));
+"${prop_with:-colon}", properties, null, null));
Assert.assertEquals("value1", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
properties.remove("normal");
Assert.assertEquals("default", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
Assert.assertEquals("abc${normal}xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e851a9a..b58f06c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,6 +109,11 @@
Remove reason phrase on WebDAV Multi-Status (207) response. (michaelo)
+
+64398: Change default value separator for property
+replacement to :- due to possible conflicts. The
+syntax is now ${name:-default}. (remm)
+
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index 0b00c60..afc7208 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -45,7 +45,7 @@
org.apache.tomcat.util.IntrospectionUtils.PropertySource.
Required to have a public constructor with no arguments.
Use this to add a property source, that will be invoked when
- ${parameter:default-value} denoted parameters (with
+ ${parameter:-default-value} denoted parameters (with
optional default values) are found in the XML files that Tomcat
parses.
Property replacement from the specified property source on the JVM
-
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: 64398: Change default value separator for property replacement
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new c7da191 64398: Change default value separator for property replacement
c7da191 is described below
commit c7da1911c919a5c4639436615f28c6e9ca6534ac
Author: remm
AuthorDate: Thu Apr 30 16:37:52 2020 +0200
64398: Change default value separator for property replacement
Due to conflicts, the syntax is now ${name:-default}.
---
java/org/apache/tomcat/util/IntrospectionUtils.java | 4 ++--
test/org/apache/tomcat/util/TestIntrospectionUtils.java | 8
webapps/docs/changelog.xml | 5 +
webapps/docs/config/systemprops.xml | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 9987533..cbf9679 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -282,9 +282,9 @@ public final class IntrospectionUtils {
String v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
// {name:default}
-int col = n.indexOf(':');
+int col = n.indexOf(":-");
if (col != -1) {
-String dV = n.substring(col+1);
+String dV = n.substring(col + 2);
n = n.substring(0, col);
v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
diff --git a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
index ef27174..ed9fe39 100644
--- a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
+++ b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
@@ -130,16 +130,16 @@ public class TestIntrospectionUtils {
Assert.assertEquals("abcvalue1xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
-properties.setProperty("prop_with:colon", "value2");
+properties.setProperty("prop_with:-colon", "value2");
Assert.assertEquals("value2", IntrospectionUtils.replaceProperties(
-"${prop_with:colon}", properties, null, null));
+"${prop_with:-colon}", properties, null, null));
Assert.assertEquals("value1", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
properties.remove("normal");
Assert.assertEquals("default", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
Assert.assertEquals("abc${normal}xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5642724..5ceb6ca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,6 +94,11 @@
Remove reason phrase on WebDAV Multi-Status (207) response. (michaelo)
+
+64398: Change default value separator for property
+replacement to :- due to possible conflicts. The
+syntax is now ${name:-default}. (remm)
+
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index c0b4e7a..106a8db 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -45,7 +45,7 @@
org.apache.tomcat.util.IntrospectionUtils.PropertySource.
Required to have a public constructor with no arguments.
Use this to add a property source, that will be invoked when
- ${parameter:default-value} denoted parameters (with
+ ${parameter:-default-value} denoted parameters (with
optional default values) are found in the XML files that Tomcat
parses.
Property replacement from the specified property source on the JVM
-
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: 64398: Change default value separator for property replacement
This is an automated email from the ASF dual-hosted git repository.
remm 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 1a3dd73 64398: Change default value separator for property replacement
1a3dd73 is described below
commit 1a3dd7368f72a5b97e93a6a100e7797eddbd5eac
Author: remm
AuthorDate: Thu Apr 30 16:37:52 2020 +0200
64398: Change default value separator for property replacement
Due to conflicts, the syntax is now ${name:-default}.
---
java/org/apache/tomcat/util/IntrospectionUtils.java | 4 ++--
test/org/apache/tomcat/util/TestIntrospectionUtils.java | 8
webapps/docs/changelog.xml | 5 +
webapps/docs/config/systemprops.xml | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 9cb648d..9cfab25 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -294,9 +294,9 @@ public final class IntrospectionUtils {
String v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
// {name:default}
-int col = n.indexOf(':');
+int col = n.indexOf(":-");
if (col != -1) {
-String dV = n.substring(col+1);
+String dV = n.substring(col + 2);
n = n.substring(0, col);
v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
diff --git a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
index ef27174..ed9fe39 100644
--- a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
+++ b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
@@ -130,16 +130,16 @@ public class TestIntrospectionUtils {
Assert.assertEquals("abcvalue1xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
-properties.setProperty("prop_with:colon", "value2");
+properties.setProperty("prop_with:-colon", "value2");
Assert.assertEquals("value2", IntrospectionUtils.replaceProperties(
-"${prop_with:colon}", properties, null, null));
+"${prop_with:-colon}", properties, null, null));
Assert.assertEquals("value1", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
properties.remove("normal");
Assert.assertEquals("default", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
Assert.assertEquals("abc${normal}xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0b40f5d..485fb83 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -93,6 +93,11 @@
64386: WebdavServlet does not send "getlastmodified"
property for resource collections. (michaelo)
+
+64398: Change default value separator for property
+replacement to :- due to possible conflicts. The
+syntax is now ${name:-default}. (remm)
+
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index d547929..0d18973 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -45,7 +45,7 @@
org.apache.tomcat.util.IntrospectionUtils.PropertySource.
Required to have a public constructor with no arguments.
Use this to add a property source, that will be invoked when
- ${parameter:default-value} denoted parameters (with
+ ${parameter:-default-value} denoted parameters (with
optional default values) are found in the XML files that Tomcat
parses.
Property replacement from the specified property source on the JVM
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64398] New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398 Remy Maucherat changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #5 from Remy Maucherat --- Ok for ":-" then. This will be in 10.0-M5, 9.0.35, 8.5.55, 7.0.104. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: 64398: Change default value separator for property replacement
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new e1d122f 64398: Change default value separator for property replacement
e1d122f is described below
commit e1d122f3853c16bdac9cfb2faa40920c662cd423
Author: remm
AuthorDate: Thu Apr 30 16:37:52 2020 +0200
64398: Change default value separator for property replacement
Due to conflicts, the syntax is now ${name:-default}.
---
java/org/apache/tomcat/util/IntrospectionUtils.java | 4 ++--
test/org/apache/tomcat/util/TestIntrospectionUtils.java | 8
webapps/docs/changelog.xml | 5 +
webapps/docs/config/systemprops.xml | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index b33254c..1bf3019 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -562,9 +562,9 @@ public final class IntrospectionUtils {
String v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
// {name:default}
-int col = n.indexOf(':');
+int col = n.indexOf(":-");
if (col != -1) {
-String dV = n.substring(col+1);
+String dV = n.substring(col + 2);
n = n.substring(0, col);
v = getProperty(n, staticProp, dynamicProp,
classLoader);
if (v == null) {
diff --git a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
index 8773e6d..c5e3095 100644
--- a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
+++ b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
@@ -131,16 +131,16 @@ public class TestIntrospectionUtils {
Assert.assertEquals("abcvalue1xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
-properties.setProperty("prop_with:colon", "value2");
+properties.setProperty("prop_with:-colon", "value2");
Assert.assertEquals("value2", IntrospectionUtils.replaceProperties(
-"${prop_with:colon}", properties, null, null));
+"${prop_with:-colon}", properties, null, null));
Assert.assertEquals("value1", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
properties.remove("normal");
Assert.assertEquals("default", IntrospectionUtils.replaceProperties(
-"${normal:default}", properties, null, null));
+"${normal:-default}", properties, null, null));
Assert.assertEquals("abc${normal}xyz",
IntrospectionUtils.replaceProperties(
"abc${normal}xyz", properties, null, null));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2596f72..8cf7d02 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,11 @@
64386: WebdavServlet does not send "getlastmodified"
property for resource collections. (michaelo)
+
+64398: Change default value separator for property
+replacement to :- due to possible conflicts. The
+syntax is now ${name:-default}. (remm)
+
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index 556298e..5ba7e8b 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -44,7 +44,7 @@
org.apache.tomcat.util.IntrospectionUtils.PropertySource.
Required to have a public constructor with no arguments.
Use this to add a property source, that will be invoked when
- ${parameter:default-value} denoted parameters (with
+ ${parameter:-default-value} denoted parameters (with
optional default values) are found in the XML files that Tomcat
parses.
org.apache.tomcat.util.digester.EnvironmentPropertySource
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5161 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 90b8ff2f330973bbe54dbbe3d702b3111bb781fc Blamelist: remm 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
[Bug 64398] New "default values in property value expressions" syntax breaks Log4j2's "property substitution" syntax
https://bz.apache.org/bugzilla/show_bug.cgi?id=64398 --- Comment #6 from Frank Erens --- Thank you for resolving this so quickly! -- 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
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1690 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] e1d122f3853c16bdac9cfb2faa40920c662cd423 Blamelist: remm 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-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2289 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 1a3dd7368f72a5b97e93a6a100e7797eddbd5eac Blamelist: remm 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 9.0.x updated: Add deprecation
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fa38322 Add deprecation
fa38322 is described below
commit fa38322b2309bcc5c4bc202fb2308d0fa32af408
Author: remm
AuthorDate: Thu Apr 30 17:44:25 2020 +0200
Add deprecation
The java.io code is being removed in Tomcat 10, since it is not the
default and it is obvious it will not scale at all.
---
java/org/apache/catalina/tribes/transport/bio/BioReceiver.java| 4
java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java | 2 ++
java/org/apache/catalina/tribes/transport/bio/BioSender.java | 2 ++
.../org/apache/catalina/tribes/transport/bio/MultipointBioSender.java | 4
java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java | 4
5 files changed, 16 insertions(+)
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
index 3214ab5..6c19893 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
@@ -28,6 +28,10 @@ import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+/**
+ * @deprecated This will be removed in Tomcat 10
+ */
+@Deprecated
public class BioReceiver extends ReceiverBase implements Runnable {
private static final Log log = LogFactory.getLog(BioReceiver.class);
diff --git
a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
index d35ee65..1453213 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
@@ -41,7 +41,9 @@ import org.apache.juli.logging.LogFactory;
* serviceChannel() method stores the key reference in the thread object then
* calls notify() to wake it up. When the channel has been drained, the worker
* thread returns itself to its parent pool.
+ * @deprecated This will be removed in Tomcat 10
*/
+@Deprecated
public class BioReplicationTask extends AbstractRxTask {
private static final Log log = LogFactory.getLog(BioReplicationTask.class);
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
index 756e1eb..18bb496 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
@@ -39,7 +39,9 @@ import org.apache.juli.logging.LogFactory;
*
* @author Peter Rossbach
* @since 5.5.16
+ * @deprecated This will be removed in Tomcat 10
*/
+@Deprecated
public class BioSender extends AbstractSender {
private static final Log log = LogFactory.getLog(BioSender.class);
diff --git
a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
index 5edd1e1..bcb9cdb 100644
--- a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
@@ -30,6 +30,10 @@ import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.transport.AbstractSender;
import org.apache.catalina.tribes.transport.MultiPointSender;
+/**
+ * @deprecated This will be removed in Tomcat 10
+ */
+@Deprecated
public class MultipointBioSender extends AbstractSender implements
MultiPointSender {
public MultipointBioSender() {
// NO-OP
diff --git
a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
index 8c92311..1ba52e1 100644
--- a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
@@ -25,6 +25,10 @@ import org.apache.catalina.tribes.transport.MultiPointSender;
import org.apache.catalina.tribes.transport.PooledSender;
import org.apache.catalina.tribes.util.StringManager;
+/**
+ * @deprecated This will be removed in Tomcat 10
+ */
+@Deprecated
public class PooledMultiSender extends PooledSender {
protected static final StringManager sm =
StringManager.getManager(PooledMultiSender.class);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] YYTVicky opened a new pull request #288: keyload update
YYTVicky opened a new pull request #288: URL: https://github.com/apache/tomcat/pull/288 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch master updated: Update index page for 1.2.24, add 2018-2020 to news navigation bar
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/master by this push: new 1ce4d1e Update index page for 1.2.24, add 2018-2020 to news navigation bar 1ce4d1e is described below commit 1ce4d1efa26e6944c530cc7c26e22a342a416b42 Author: Mark Thomas AuthorDate: Thu Apr 30 19:33:55 2020 +0100 Update index page for 1.2.24, add 2018-2020 to news navigation bar --- xdocs/index.xml| 4 ++-- xdocs/news/project.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index e419249..24b7a71 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -59,10 +59,10 @@ -07 Jul 2019 - TC-Native-1.2.23 +29 Apr 2020 - TC-Native-1.2.24 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 1.2.23 Stable. +Tomcat Native 1.2.24 Stable. The sources and the binaries for selected platforms are available from the Download page. diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index c6b59ac..5e76d93 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -34,6 +34,9 @@ + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (90b8ff2 -> 899554d)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 90b8ff2 64398: Change default value separator for property replacement new b31568b Tweak wording for clarity new 899554d Add key store type section The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webapps/docs/changelog.xml | 4 webapps/docs/config/http.xml | 54 +--- 2 files changed, 50 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Tweak wording for clarity
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b31568b57f4c15f0a9356db67606827b2cdd305d Author: Mark Thomas AuthorDate: Thu Apr 30 19:36:07 2020 +0100 Tweak wording for clarity --- webapps/docs/config/http.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 2b25f26..6a052ef 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1581,9 +1581,9 @@ Tomcat Version -6.x onwards -8.x onwards -5.5.x onwards +since 6.0.x +since 8.0.x +since 5.5.x Support Polling - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add key store type section
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 899554d61cf7967e84f61d60cc107ca9c3e0f7fe
Author: Mark Thomas
AuthorDate: Thu Apr 30 21:06:21 2020 +0100
Add key store type section
---
webapps/docs/changelog.xml | 4
webapps/docs/config/http.xml | 48 +++-
2 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b58f06c..830cd63 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -174,6 +174,10 @@
Fix the saving of a Context configuration file via the scripting
interface of the Manager web application. (markt)
+
+Add a section to the TLS Connector documentation on different key store
+types and how to configure them. (markt)
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 6a052ef..2c5fea9 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1398,7 +1398,8 @@
TLS virtual host and that certificate has a keystoreType
that
is not PKCS12 then the default will be the
keystoreType of the single certificate. If none of these
- identify a default, the default will be JKS.
+ identify a default, the default will be JKS. See the notes
on
+ key store types below.
@@ -1498,7 +1499,8 @@
If not specified, the value of the system property
javax.net.ssl.keyStoreType is used. If neither this
attribute
nor the system property are set, a default value of "JKS".
is
- used.
+ used. See the notes on key store types
+ below.
@@ -1562,6 +1564,42 @@
+
+
+In addition to the standard key store types (JKS and PKCS12), most Java
+runtimes support additional key store types such as Windows-ROOT,
+Windows-My, DKS as well as hardware security modules. Generally, to use
+these additional keystore types with a TLS Conector in Tomcat:
+
+
+ Set the certificateKeystoreType and/or truststoreType Connector
+ attribute (as appropriate) to the necessary type
+ If a configuration file is required, set the certificateKeystoreFile
+ and/or truststoreFile Connector attribute (as appropriate) to point
to
+ the file
+ If no configuration file is required then you will almost certainly
+ need to explicitly set the certificateKeystoreFile and/or
+ truststoreFile Connector attribute (as appropriate) to the empty
+ string ("")
+ If a password is required, set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the
+ required password
+ If no password is required then you will almost certainly need to
+ explicitly set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the empty
+ string ("")
+
+
+Variations in key store implementations, combined with the key store
+manipulation Tomcat does in the background to allow interoperability
between
+JSSE and OpenSSL configuration styles, means that some keystores may need
+slightly different configuration. Assitance is always available from the
+http://tomcat.apache.org/lists.html#tomcat-users";>Apache Tomcat
+users mailing list. We aim to document any key stores that vary from
the
+above advice here. Currently there are none we are aware of.
+
+
+
Below is a small chart that shows how the connectors differ.
@@ -1569,9 +1607,9 @@
-Java Nio ConnectorNIO
-Java Nio2 ConnectorNIO2
-APR/native ConnectorAPR
+Java Nio ConnectorNIO
+Java Nio2 ConnectorNIO2
+APR/native ConnectorAPR
Classname
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Revert unintended change
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 40fd644 Revert unintended change 40fd644 is described below commit 40fd644b79644726a85f5ea5c70f382fc2847f36 Author: Mark Thomas AuthorDate: Thu Apr 30 21:10:23 2020 +0100 Revert unintended change --- webapps/docs/config/http.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 2c5fea9..5e447e9 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1607,9 +1607,9 @@ -Java Nio ConnectorNIO -Java Nio2 ConnectorNIO2 -APR/native ConnectorAPR +Java Nio ConnectorNIO +Java Nio2 ConnectorNIO2 +APR/native ConnectorAPR Classname - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add key store type section
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 09326c68a6bf55c12adefc36c427077389a7e72f
Author: Mark Thomas
AuthorDate: Thu Apr 30 21:06:21 2020 +0100
Add key store type section
---
webapps/docs/changelog.xml | 4
webapps/docs/config/http.xml | 42 --
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5ceb6ca..35b9cc9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,10 @@
Fix the saving of a Context configuration file via the scripting
interface of the Manager web application. (markt)
+
+Add a section to the TLS Connector documentation on different key store
+types and how to configure them. (markt)
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index f73d26f..7f6cf2f 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1439,7 +1439,8 @@
TLS virtual host and that certificate has a keystoreType
that
is not PKCS12 then the default will be the
keystoreType of the single certificate. If none of these
- identify a default, the default will be JKS.
+ identify a default, the default will be JKS. See the notes
on
+ key store types below.
@@ -1539,7 +1540,8 @@
If not specified, the value of the system property
javax.net.ssl.keyStoreType is used. If neither this
attribute
nor the system property are set, a default value of "JKS".
is
- used.
+ used. See the notes on key store types
+ below.
@@ -1602,6 +1604,42 @@
+
+
+In addition to the standard key store types (JKS and PKCS12), most Java
+runtimes support additional key store types such as Windows-ROOT,
+Windows-My, DKS as well as hardware security modules. Generally, to use
+these additional keystore types with a TLS Conector in Tomcat:
+
+
+ Set the certificateKeystoreType and/or truststoreType Connector
+ attribute (as appropriate) to the necessary type
+ If a configuration file is required, set the certificateKeystoreFile
+ and/or truststoreFile Connector attribute (as appropriate) to point
to
+ the file
+ If no configuration file is required then you will almost certainly
+ need to explicitly set the certificateKeystoreFile and/or
+ truststoreFile Connector attribute (as appropriate) to the empty
+ string ("")
+ If a password is required, set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the
+ required password
+ If no password is required then you will almost certainly need to
+ explicitly set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the empty
+ string ("")
+
+
+Variations in key store implementations, combined with the key store
+manipulation Tomcat does in the background to allow interoperability
between
+JSSE and OpenSSL configuration styles, means that some keystores may need
+slightly different configuration. Assitance is always available from the
+http://tomcat.apache.org/lists.html#tomcat-users";>Apache Tomcat
+users mailing list. We aim to document any key stores that vary from
the
+above advice here. Currently there are none we are aware of.
+
+
+
The following NIO and NIO2 SSL configuration attributes have been
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Tweak wording for clarity
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 88dd57d9719ac3f897332d757ac86c0aac65012c Author: Mark Thomas AuthorDate: Thu Apr 30 19:36:07 2020 +0100 Tweak wording for clarity --- webapps/docs/config/http.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index ed62ffb..f73d26f 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1967,9 +1967,9 @@ Tomcat Version -6.x onwards -8.x onwards -5.5.x onwards +since 6.0.x +since 8.0.x +since 5.5.x Support Polling - 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 (fa38322 -> 09326c6)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from fa38322 Add deprecation new 88dd57d Tweak wording for clarity new 09326c6 Add key store type section The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webapps/docs/changelog.xml | 4 webapps/docs/config/http.xml | 48 +++- 2 files changed, 47 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add key store type section
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 525b6995500637eade78704f22650953b4450948
Author: Mark Thomas
AuthorDate: Thu Apr 30 21:06:21 2020 +0100
Add key store type section
---
webapps/docs/changelog.xml | 4
webapps/docs/config/http.xml | 42 --
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 485fb83..be78bdb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,10 @@
Fix the saving of a Context configuration file via the scripting
interface of the Manager web application. (markt)
+
+Add a section to the TLS Connector documentation on different key store
+types and how to configure them. (markt)
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index ed97d26..e8616e5 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1449,7 +1449,8 @@
TLS virtual host and that certificate has a keystoreType
that
is not PKCS12 then the default will be the
keystoreType of the single certificate. If none of these
- identify a default, the default will be JKS.
+ identify a default, the default will be JKS. See the notes
on
+ key store types below.
@@ -1549,7 +1550,8 @@
If not specified, the value of the system property
javax.net.ssl.keyStoreType is used. If neither this
attribute
nor the system property are set, a default value of "JKS".
is
- used.
+ used. See the notes on key store types
+ below.
@@ -1612,6 +1614,42 @@
+
+
+In addition to the standard key store types (JKS and PKCS12), most Java
+runtimes support additional key store types such as Windows-ROOT,
+Windows-My, DKS as well as hardware security modules. Generally, to use
+these additional keystore types with a TLS Conector in Tomcat:
+
+
+ Set the certificateKeystoreType and/or truststoreType Connector
+ attribute (as appropriate) to the necessary type
+ If a configuration file is required, set the certificateKeystoreFile
+ and/or truststoreFile Connector attribute (as appropriate) to point
to
+ the file
+ If no configuration file is required then you will almost certainly
+ need to explicitly set the certificateKeystoreFile and/or
+ truststoreFile Connector attribute (as appropriate) to the empty
+ string ("")
+ If a password is required, set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the
+ required password
+ If no password is required then you will almost certainly need to
+ explicitly set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the empty
+ string ("")
+
+
+Variations in key store implementations, combined with the key store
+manipulation Tomcat does in the background to allow interoperability
between
+JSSE and OpenSSL configuration styles, means that some keystores may need
+slightly different configuration. Assitance is always available from the
+http://tomcat.apache.org/lists.html#tomcat-users";>Apache Tomcat
+users mailing list. We aim to document any key stores that vary from
the
+above advice here. Currently there are none we are aware of.
+
+
+
The following NIO and NIO2 SSL configuration attributes have been
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Tweak wording for clarity
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b22f9e3562363ac6794a311235b8a61bb9b66886 Author: Mark Thomas AuthorDate: Thu Apr 30 19:36:07 2020 +0100 Tweak wording for clarity --- webapps/docs/config/http.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index e2da0a7..ed97d26 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1977,9 +1977,9 @@ Tomcat Version -6.x onwards -8.x onwards -5.5.x onwards +since 6.0.x +since 8.0.x +since 5.5.x Support Polling - 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 (1a3dd73 -> 525b699)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 1a3dd73 64398: Change default value separator for property replacement new b22f9e3 Tweak wording for clarity new 525b699 Add key store type section The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webapps/docs/changelog.xml | 4 webapps/docs/config/http.xml | 48 +++- 2 files changed, 47 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Tweak wording for clarity
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 3595979efbd91c77d529e2b2014050679d50d780 Author: Mark Thomas AuthorDate: Thu Apr 30 19:36:07 2020 +0100 Tweak wording for clarity --- webapps/docs/config/http.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 4e71441..768c984 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1445,7 +1445,7 @@ Java Blocking Connector Java Non Blocking Connector APR/native Connector BIO NIO APR Classname Http11Protocol Http11NioProtocol Http11AprProtocol -Tomcat Version 3.x onwards 6.x onwards 5.5.x onwards +Tomcat Versionsince 3.x since 6.0.x since 5.5.x Support Polling NO YES YES Polling Size N/A maxConnections maxConnections Read Request Headers Blocking Non Blocking Blocking - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add key store type section
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f7463e9efba42cbe846be0b4794a5ee4f70b5a9a
Author: Mark Thomas
AuthorDate: Thu Apr 30 21:06:21 2020 +0100
Add key store type section
---
webapps/docs/changelog.xml | 4
webapps/docs/config/http.xml | 43 +--
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8cf7d02..01b5910 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,6 +178,10 @@
system property changing how the sequence %5c is
interpretted in a URI. (markt)
+
+Add a section to the TLS Connector documentation on different key store
+types and how to configure them. (markt)
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 768c984..96a9715 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1175,7 +1175,8 @@
The type of keystore file to be used for the server certificate.
- If not specified, the default value is "JKS".
+ If not specified, the default value is "JKS". See the notes
+ on key store types below.
@@ -1283,7 +1284,8 @@
The type of key store used for the trust store. The default is the
value of the javax.net.ssl.trustStoreType system property.
If
that property is null, the value of keystoreType is used as
- the default.
+ the default. See the notes on key store
+ types below.
@@ -1438,6 +1440,43 @@
+
+
+
+In addition to the standard key store types (JKS and PKCS12), most Java
+runtimes support additional key store types such as Windows-ROOT,
+Windows-My, DKS as well as hardware security modules. Generally, to use
+these additional keystore types with a TLS Conector in Tomcat:
+
+
+ Set the certificateKeystoreType and/or truststoreType Connector
+ attribute (as appropriate) to the necessary type
+ If a configuration file is required, set the certificateKeystoreFile
+ and/or truststoreFile Connector attribute (as appropriate) to point
to
+ the file
+ If no configuration file is required then you will almost certainly
+ need to explicitly set the certificateKeystoreFile and/or
+ truststoreFile Connector attribute (as appropriate) to the empty
+ string ("")
+ If a password is required, set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the
+ required password
+ If no password is required then you will almost certainly need to
+ explicitly set the certificateKeystorePassword and/or
+ truststorePassword Connector attribute (as appropriate) to the empty
+ string ("")
+
+
+Variations in key store implementations, combined with the key store
+manipulation Tomcat does in the background to allow interoperability
between
+JSSE and OpenSSL configuration styles, means that some keystores may need
+slightly different configuration. Assitance is always available from the
+http://tomcat.apache.org/lists.html#tomcat-users";>Apache Tomcat
+users mailing list. We aim to document any key stores that vary from
the
+above advice here. Currently there are none we are aware of.
+
+
+
Below is a small chart that shows how the connectors differ.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (e1d122f -> f7463e9)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from e1d122f 64398: Change default value separator for property replacement new 3595979 Tweak wording for clarity new f7463e9 Add key store type section The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webapps/docs/changelog.xml | 4 webapps/docs/config/http.xml | 45 +--- 2 files changed, 46 insertions(+), 3 deletions(-) - 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 #288: keyload update
markt-asf commented on pull request #288: URL: https://github.com/apache/tomcat/pull/288#issuecomment-622089826 Adding comments to the code is note the way to recommend code changes. Also, I don't agree with the recommendation. This PR will not be applied. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #287: Fix typos
markt-asf commented on pull request #287: URL: https://github.com/apache/tomcat/pull/287#issuecomment-622096873 Thanks. We use POEditor.com to manage translations. I've updated the string there and we will pick up the change the next time we import the translations from POEditor.com to Tomcat. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64402] New: mr.vta
https://bz.apache.org/bugzilla/show_bug.cgi?id=64402 Bug ID: 64402 Summary: mr.vta Product: Tomcat 10 Version: unspecified Hardware: All OS: Linux Status: NEW Severity: enhancement Priority: P2 Component: Authentication Assignee: dev@tomcat.apache.org Reporter: mblehkos...@gmail.com Target Milestone: -- Created attachment 37211 --> https://bz.apache.org/bugzilla/attachment.cgi?id=37211&action=edit bugzilla mr.vta -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64402] mr.vta
https://bz.apache.org/bugzilla/show_bug.cgi?id=64402 mr.vta changed: What|Removed |Added Attachment #37211|text/html |text/plain mime type|| Attachment #37211|0 |1 is obsolete|| Attachment #37211|0 |1 is patch|| --- Comment #1 from mr.vta --- Comment on attachment 37211 --> https://bz.apache.org/bugzilla/attachment.cgi?id=37211 bugzilla HACKED BY MR.VTA SOLO ITU IJEN -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64402] mr.vta
https://bz.apache.org/bugzilla/show_bug.cgi?id=64402 --- Comment #2 from mr.vta --- Comment on attachment 37211 --> https://bz.apache.org/bugzilla/attachment.cgi?id=37211 bugzilla HACKED BY MR.VTA SOLO ITU IJEN -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64402] mr.vta
https://bz.apache.org/bugzilla/show_bug.cgi?id=64402 --- Comment #3 from mr.vta --- Comment on attachment 37211 --> https://bz.apache.org/bugzilla/attachment.cgi?id=37211 bugzilla HACKED BY MR.VTA Solo Itu Ijen -- 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
