Author: markt
Date: Fri May 4 09:46:59 2012
New Revision: 1333829
URL: http://svn.apache.org/viewvc?rev=1333829&view=rev
Log:
Use a proper URL else attempts to external entities will fail.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1333827
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1333829&r1=1333828&r2=1333829&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Fri May
4 09:46:59 2012
@@ -454,7 +454,7 @@ public class Catalina {
FileInputStream fis = null;
try {
InputSource is =
- new InputSource("file://" + file.getAbsolutePath());
+ new InputSource(file.toURI().toURL().toString());
fis = new FileInputStream(file);
is.setByteStream(fis);
digester.push(this);
@@ -542,7 +542,7 @@ public class Catalina {
try {
file = configFile();
inputStream = new FileInputStream(file);
- inputSource = new InputSource("file://" + file.getAbsolutePath());
+ inputSource = new InputSource(file.toURI().toURL().toString());
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("catalina.configFail", file), e);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1333829&r1=1333828&r2=1333829&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 4 09:46:59 2012
@@ -80,6 +80,11 @@
<code>DefaultInstanceManager</code> by trimming annotation lists
to their size. (kkolinko)
</update>
+ <fix>
+ Correctly configure the parser used to process server.xml so that
+ external entities may be used to include the content of external files
+ into server.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
