You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/07/30 11:32:01 UTC
svn commit: r680948 -
/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
Author: markt
Date: Wed Jul 30 02:31:54 2008
New Revision: 680948
URL: http://svn.apache.org/viewvc?rev=680948&view=rev
Log:
Port r673834 to 4.1.x (Note most was covered by r680947 since 4.1.x and 5.5.x share the same connector code)
Make filtering of \r and \n in headers consistent for all connectors.
Make handling of 404s consistent across components.
Provide option to include custom status message in headers. SRV.5.3 suggests custom messages are intended for the body of the response, not the status line.
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java?rev=680948&r1=680947&r2=680948&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java Wed Jul 30 02:31:54 2008
@@ -113,7 +113,7 @@
relativeURI.equals("/WEB-INF") ||
relativeURI.startsWith("/META-INF/") ||
relativeURI.startsWith("/WEB-INF/")) {
- notFound(requestURI, (HttpServletResponse) response.getResponse());
+ notFound((HttpServletResponse) response.getResponse());
return;
}
@@ -129,7 +129,7 @@
return;
}
if (wrapper == null) {
- notFound(requestURI, (HttpServletResponse) response.getResponse());
+ notFound((HttpServletResponse) response.getResponse());
return;
}
@@ -171,13 +171,12 @@
* application, but currently that code runs at the wrapper level rather
* than the context level.
*
- * @param requestURI The request URI for the requested resource
* @param response The response we are creating
*/
- private void notFound(String requestURI, HttpServletResponse response) {
+ private void notFound(HttpServletResponse response) {
try {
- response.sendError(HttpServletResponse.SC_NOT_FOUND, requestURI);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (IllegalStateException e) {
;
} catch (IOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org