amyroh 2003/11/06 15:43:18
Modified: catalina/src/share/org/apache/catalina/core
StandardHostValve.java
catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
Log:
Apply patch for bugzilla 9723 and bugtraq 4701571 - Avoid unneccessray calls to
RequestUtil.filter.
Patch submitted by Arvind Srinivasan<[EMAIL PROTECTED]>
Revision Changes Path
1.12 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
Index: StandardHostValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StandardHostValve.java 2 Sep 2003 21:22:04 -0000 1.11
+++ StandardHostValve.java 6 Nov 2003 23:43:18 -0000 1.12
@@ -321,9 +321,6 @@
if (!(response.getResponse() instanceof HttpServletResponse))
return;
int statusCode = hresponse.getStatus();
- String message = RequestUtil.filter(hresponse.getMessage());
- if (message == null)
- message = "";
// Handle a custom error page for this status code
Context context = request.getContext();
@@ -337,6 +334,9 @@
ServletResponse sresp = response.getResponse();
sreq.setAttribute(Globals.STATUS_CODE_ATTR,
new Integer(statusCode));
+ String message = RequestUtil.filter(hresponse.getMessage());
+ if (message == null)
+ message = "";
sreq.setAttribute(Globals.ERROR_MESSAGE_ATTR, message);
sreq.setAttribute
(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
1.12 +8 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ErrorReportValve.java 12 Sep 2003 13:17:06 -0000 1.11
+++ ErrorReportValve.java 6 Nov 2003 23:43:18 -0000 1.12
@@ -238,9 +238,6 @@
return;
HttpServletResponse hres = (HttpServletResponse) response;
int statusCode = hresponse.getStatus();
- String message = RequestUtil.filter(hresponse.getMessage());
- if (message == null)
- message = "";
// Do nothing on a 1xx, 2xx and 3xx status
if (statusCode < 400)
@@ -265,6 +262,10 @@
}
+ String message = RequestUtil.filter(hresponse.getMessage());
+ if (message == null)
+ message = "";
+
// Do nothing if there is no report for the specified status code
String report = null;
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
