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 8effcd3 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63311
https XML URLs
8effcd3 is described below
commit 8effcd372e2709d1d229d2b709c92830f617811e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Apr 7 23:05:21 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63311 https XML URLs
Add support for https URLs to the local resolver within Tomcat used to
resolve standard XML DTDs and schemas when Tomcat is configured to
validate XML configuration files such as web.xml
---
java/org/apache/tomcat/util/descriptor/DigesterFactory.java | 7 +++++++
webapps/docs/changelog.xml | 5 +++++
2 files changed, 12 insertions(+)
diff --git a/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
index 4a6632c..2947033 100644
--- a/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
+++ b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
@@ -140,6 +140,13 @@ public class DigesterFactory {
private static void add(Map<String,String> ids, String id, String
location) {
if (location != null) {
ids.put(id, location);
+ // BZ 63311
+ // Support http and https locations as the move away from http and
+ // towards https continues.
+ if (id.startsWith("http://";)) {
+ String httpsId = "https://"; + id.substring(7);
+ ids.put(httpsId, location);
+ }
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7c92d7e..e4ccff3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,6 +96,11 @@
<bug>63287</bug>: Make logging levels more consistent for similar
issues
of similar severity. (markt)
</fix>
+ <fix>
+ <bug>63311</bug>: Add support for https URLs to the local resolver
within
+ Tomcat used to resolve standard XML DTDs and schemas when Tomcat is
+ configured to validate XML configuration files such as web.xml. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
