Author: kkolinko
Date: Mon Jan 17 09:29:13 2011
New Revision: 1059827
URL: http://svn.apache.org/viewvc?rev=1059827&view=rev
Log:
Update examples of configurations of RemoteAddrValve, RemoteHostValve
We are using java.util.regex, not Jakarta regex.
CTR (docs)
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1059827&r1=1059826&r2=1059827&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Mon Jan 17 09:29:13
2011
@@ -730,9 +730,8 @@
<a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
<a href="context.html">Context</a> element. The remote address or name
will be checked against a configured list of "accept" and/or "deny"
- filters, which are defined using the Regular Expression syntax supported
- by the <a href="http://jakarta.apache.org/regexp/";>Jakarta Regexp</a>
- regular expression library. Requests that come from locations that are
+ filters, which are defined using <code>java.util.regex</code> Regular
+ Expression syntax. Requests that come from locations that are
not accepted will be rejected with an HTTP "Forbidden" error.
Example filter declarations:</p>
@@ -740,9 +739,9 @@
<Context path="/examples" ...>
...
<Valve className="org.apache.catalina.valves.RemoteHostValve"
- allow="*.mycompany.com,www.yourcompany.com"/>
+ allow=".*\.mycompany\.com|www\.yourcompany\.com"/>
<Valve className="org.apache.catalina.valves.RemoteAddrValve"
- deny="192.168.1.*"/>
+ deny="192\.168\.1\.\d+"/>
...
</Context>
</source>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml?rev=1059827&r1=1059826&r2=1059827&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml Mon Jan 17 09:29:13 2011
@@ -225,9 +225,8 @@
<a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
<a href="context.html">Context</a> element. The remote address or name
will be checked against a configured list of "accept" and/or "deny"
- filters, which are defined using the Regular Expression syntax supported
- by the <a href="http://jakarta.apache.org/regexp/";>Jakarta Regexp</a>
- regular expression library. Requests that come from locations that are
+ filters, which are defined using <code>java.util.regex</code> Regular
+ Expression syntax. Requests that come from locations that are
not accepted will be rejected with an HTTP "Forbidden" error.
Example filter declarations:</p>
@@ -235,9 +234,9 @@
<Engine name="Standalone" ...>
...
<Valve className="org.apache.catalina.valves.RemoteHostValve"
- allow="*.mycompany.com,www.yourcompany.com"/>
+ allow=".*\.mycompany\.com|www\.yourcompany\.com"/>
<Valve className="org.apache.catalina.valves.RemoteAddrValve"
- deny="192.168.1.*"/>
+ deny="192\.168\.1\.\d+"/>
...
</Engine>
</source>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml?rev=1059827&r1=1059826&r2=1059827&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Mon Jan 17 09:29:13 2011
@@ -471,9 +471,8 @@
<a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
<a href="context.html">Context</a> element. The remote address or name
will be checked against a configured list of "accept" and/or "deny"
- filters, which are defined using the Regular Expression syntax supported
- by the <a href="http://jakarta.apache.org/regexp/";>Jakarta Regexp</a>
- regular expression library. Requests that come from locations that are
+ filters, which are defined using <code>java.util.regex</code> Regular
+ Expression syntax. Requests that come from locations that are
not accepted will be rejected with an HTTP "Forbidden" error.
Example filter declarations:</p>
@@ -481,9 +480,9 @@
<Host name="localhost" ...>
...
<Valve className="org.apache.catalina.valves.RemoteHostValve"
- allow="*.mycompany.com,www.yourcompany.com"/>
+ allow=".*\.mycompany\.com|www\.yourcompany\.com"/>
<Valve className="org.apache.catalina.valves.RemoteAddrValve"
- deny="192.168.1.*"/>
+ deny="192\.168\.1\.\d+"/>
...
</Host>
</source>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
