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 7240906 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63311
https XML URLs
7240906 is described below
commit 7240906ef33cc57ff54245d6993d36aa6a555e38
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 3c2650c..1b83e15 100644
--- a/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
+++ b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
@@ -125,6 +125,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 60ff2df..8813a12 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,11 @@
attribute in the <code>AccessLogValve</code> for <code>%D</code> and
<code>%T</code>. (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
