Author: jim
Date: Tue Dec 20 14:25:24 2011
New Revision: 1221276
URL: http://svn.apache.org/viewvc?rev=1221276view=rev
Log:
* Make configuration issue for RemoteAddrValve, RemoteHostValve result
in the failure of the valve rather than just a warning message.
Ensure changes to the configuration of these valves via JMX are thread-safe.
Refactor value matching logic into separate method.
Expose the new method isAllowed and isAllowValid, isDenyValid
properties through JMX.
It is based on r1189256 and r1187027, r1198622
(r1189258, r1187029, r1198623 in TC7)
http://people.apache.org/~kkolinko/patches/2011-11-08_tc55_RequestFilterValve_v4.patch
+1: kkolinko,funkman,jim
-1:
kkolinko: It does its work and prevents app from starting
and working. Though
1. Autodeployment prints the same error every 10s. It
is OK, though a
bit annoying.
2. Application that failed to start responds
with 403. I do not
understand why. I would expect 404 or
503.
3. Application that failed to
start is not listed by the manager app.
It is expected, but does
not explain why error 403 and not 404 is observed.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1221276r1=1221275r2=1221276view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Dec 20 14:25:24 2011
@@ -24,25 +24,6 @@ $Id$
PATCHES ACCEPTED TO BACKPORT FROM TRUNK/OTHER:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Make configuration issue for RemoteAddrValve, RemoteHostValve result
- in the failure of the valve rather than just a warning message.
- Ensure changes to the configuration of these valves via JMX are thread-safe.
- Refactor value matching logic into separate method.
- Expose the new method isAllowed and isAllowValid, isDenyValid properties
through JMX.
- It is based on r1189256 and r1187027, r1198622
- (r1189258, r1187029, r1198623 in TC7)
-
http://people.apache.org/~kkolinko/patches/2011-11-08_tc55_RequestFilterValve_v4.patch
- +1: kkolinko,funkman,jim
- -1:
-
- kkolinko: It does its work and prevents app from starting and working. Though
-1. Autodeployment prints the same error every 10s. It is OK, though a
- bit annoying.
-2. Application that failed to start responds with 403. I do not
- understand why. I would expect 404 or 503.
-3. Application that failed to start is not listed by the manager app.
- It is expected, but does not explain why error 403 and not 404 is
observed.
-
* Improve performance of parameter processing
add
Improve performance of parameter processing for GET and POST requests.
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties?rev=1221276r1=1221275r2=1221276view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
Tue Dec 20 14:25:24 2011
@@ -21,12 +21,15 @@ certificatesValve.alreadyStarted=Certifi
certificatesValve.notStarted=Certificates Valve has not yet been started
interceptorValve.alreadyStarted=Interceptor Valve has already been started
interceptorValve.notStarted=Interceptor Valve has not yet been started
-requestFilterValve.next=No ''next'' valve has been configured
-requestFilterValve.syntax=Syntax error in request filter pattern {0}
valveBase.noNext=Configuration error: No ''next'' valve configured
jdbcAccessLogValve.exception=Exception performing insert access entry
jdbcAccessLogValve.close=Exception closing database connection
+# Request filter valve - RemoteAddrValve, RemoteHostValve
+requestFilterValve.alreadyStarted=Valve has already been started
+requestFilterValve.syntax=Syntax error in request filter pattern {0}
+requestFilterValve.configInvalid=One or more invalid configuration settings
were provided for the