This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 5754810bd7 Remove code that provides a workaround required with a
security manager
5754810bd7 is described below
commit 5754810bd7f5eebd728d36129423547a1ea6ad82
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 23 11:22:05 2023 +0000
Remove code that provides a workaround required with a security manager
---
java/org/apache/catalina/webresources/war/Handler.java | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/java/org/apache/catalina/webresources/war/Handler.java
b/java/org/apache/catalina/webresources/war/Handler.java
index d2a09d155b..fea82d0ba6 100644
--- a/java/org/apache/catalina/webresources/war/Handler.java
+++ b/java/org/apache/catalina/webresources/war/Handler.java
@@ -27,20 +27,4 @@ public class Handler extends URLStreamHandler {
protected URLConnection openConnection(URL u) throws IOException {
return new WarURLConnection(u);
}
-
- @Override
- protected void setURL(URL u, String protocol, String host, int port,
String authority, String userInfo, String path,
- String query, String ref) {
- if (path.startsWith("file:") && !path.startsWith("file:/")) {
- // Work around a problem with the URLs in the security policy file.
- // On Windows, the use of ${catalina.[home|base]} in the policy
file
- // results in codebase URLs of the form file:C:/... when they
should
- // be file:/C:/...
- // For file: and jar: URLs, the JRE compensates for this. It does
not
- // compensate for this for war:file:... URLs. Therefore, we do that
- // here
- path = "file:/" + path.substring(5);
- }
- super.setURL(u, protocol, host, port, authority, userInfo, path,
query, ref);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
