amyroh 2002/09/12 13:40:37
Modified: catalina/src/share/org/apache/catalina/core
StandardContextValve.java
catalina/src/share/org/apache/catalina/ssi SSIServlet.java
Log:
Change back to return 404 since the spec will be changed to require 404
for WEB-INF and META-INF directories.
Revision Changes Path
1.3 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
Index: StandardContextValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardContextValve.java 12 Sep 2002 00:37:56 -0000 1.2
+++ StandardContextValve.java 12 Sep 2002 20:40:37 -0000 1.3
@@ -165,7 +165,7 @@
relativeURI.equals("/WEB-INF") ||
relativeURI.startsWith("/META-INF/") ||
relativeURI.startsWith("/WEB-INF/")) {
- forbidden(requestURI, (HttpServletResponse) response.getResponse());
+ notFound(requestURI, (HttpServletResponse) response.getResponse());
return;
}
1.3 +24 -22
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
Index: SSIServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SSIServlet.java 12 Sep 2002 00:37:56 -0000 1.2
+++ SSIServlet.java 12 Sep 2002 20:40:37 -0000 1.3
@@ -216,15 +216,15 @@
path.toUpperCase().startsWith("/WEB-INF") ||
path.toUpperCase().startsWith("/META-INF") ) {
- res.sendError(res.SC_FORBIDDEN, path);
- log( "Can't serve file: " + path );
+ res.sendError(res.SC_NOT_FOUND , path);
+ log( "Can't serve file: " + path );
return;
}
- URL resource = servletContext.getResource(path);
+ URL resource = servletContext.getResource(path);
if (resource==null) {
res.sendError(res.SC_NOT_FOUND, path);
- log( "Can't find file: " + path );
+ log( "Can't find file: " + path );
return;
}
@@ -235,36 +235,38 @@
new java.util.Date()).getTime() + expires.longValue() * 1000);
}
- processSSI( req, res, resource );
+ processSSI( req, res, resource );
}
protected void processSSI( HttpServletRequest req,
HttpServletResponse res,
URL resource ) throws IOException {
- SSIExternalResolver ssiExternalResolver = new SSIServletExternalResolver( this,
req, res,
- isVirtualWebappRelative,
- debug );
- SSIProcessor ssiProcessor = new SSIProcessor( ssiExternalResolver, debug );
+
+ SSIExternalResolver ssiExternalResolver =
+ new SSIServletExternalResolver( this, req, res,
+ isVirtualWebappRelative,
+ debug );
+ SSIProcessor ssiProcessor = new SSIProcessor( ssiExternalResolver, debug );
PrintWriter printWriter = null;
- StringWriter stringWriter = null;
+ StringWriter stringWriter = null;
if (buffered) {
- stringWriter = new StringWriter();
+ stringWriter = new StringWriter();
printWriter = new PrintWriter( stringWriter );
} else {
printWriter = res.getWriter();
- }
+ }
URLConnection resourceInfo = resource.openConnection();
InputStream resourceInputStream = resourceInfo.getInputStream();
- BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(
resourceInputStream ) );
- Date lastModifiedDate = new Date( resourceInfo.getLastModified() );
- ssiProcessor.process( bufferedReader, lastModifiedDate, printWriter );
+ BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(
resourceInputStream ) );
+ Date lastModifiedDate = new Date( resourceInfo.getLastModified() );
+ ssiProcessor.process( bufferedReader, lastModifiedDate, printWriter );
if ( buffered ) {
- printWriter.flush();
- String text = stringWriter.toString();
+ printWriter.flush();
+ String text = stringWriter.toString();
res.getWriter().write( text );
- }
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
