Author: kkolinko
Date: Sat Jan 15 18:54:46 2011
New Revision: 1059390
URL: http://svn.apache.org/viewvc?rev=1059390&view=rev
Log:
Update examples for RemoveAddrValve, RemoteHostValve in the docs
Modified:
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/engine.xml
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/host.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1059390&r1=1059389&r2=1059390&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Sat Jan 15 18:54:46 2011
@@ -837,10 +837,9 @@
incoming request directed to the surrounding
<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
+ will be checked against configured "accept" and/or "deny"
+ 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>
@@ -848,9 +847,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/trunk/webapps/docs/config/engine.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/engine.xml?rev=1059390&r1=1059389&r2=1059390&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/trunk/webapps/docs/config/engine.xml Sat Jan 15 18:54:46 2011
@@ -224,10 +224,9 @@
incoming request directed to the surrounding
<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
+ will be checked against configured "accept" and/or "deny"
+ 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/trunk/webapps/docs/config/filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1059390&r1=1059389&r2=1059390&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Sat Jan 15 18:54:46 2011
@@ -549,7 +549,7 @@ FINE: Request "/docs/config/manager.html
<attributes>
<attribute name="allow" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's IP address is compared to. If this attribute
is specified, the remote address MUST match for this request to be
accepted. If this attribute is not specified, all requests will be
@@ -558,7 +558,7 @@ FINE: Request "/docs/config/manager.html
</attribute>
<attribute name="deny" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's IP address is compared to. If this attribute
is specified, the remote address MUST NOT match for this request to be
accepted. If this attribute is not specified, request acceptance is
@@ -604,7 +604,7 @@ FINE: Request "/docs/config/manager.html
<attributes>
<attribute name="allow" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's hostname is compared to. If this attribute
is specified, the remote hostname MUST match for this request to be
accepted. If this attribute is not specified, all requests will be
@@ -613,7 +613,7 @@ FINE: Request "/docs/config/manager.html
</attribute>
<attribute name="deny" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's hostname is compared to. If this attribute
is specified, the remote hostname MUST NOT match for this request to be
accepted. If this attribute is not specified, request acceptance is
Modified: tomcat/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1059390&r1=1059389&r2=1059390&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/trunk/webapps/docs/config/host.xml Sat Jan 15 18:54:46 2011
@@ -519,10 +519,9 @@
incoming request directed to the surrounding
<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
+ will be checked against configured "accept" and/or "deny"
+ 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>
@@ -530,9 +529,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>
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1059390&r1=1059389&r2=1059390&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Sat Jan 15 18:54:46 2011
@@ -258,7 +258,7 @@
</attribute>
<attribute name="allow" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's IP address is compared to. If this attribute
is specified, the remote address MUST match for this request to be
accepted. If this attribute is not specified, all requests will be
@@ -267,7 +267,7 @@
</attribute>
<attribute name="deny" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's IP address is compared to. If this attribute
is specified, the remote address MUST NOT match for this request to be
accepted. If this attribute is not specified, request acceptance is
@@ -314,7 +314,7 @@
</attribute>
<attribute name="allow" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's hostname is compared to. If this attribute
is specified, the remote hostname MUST match for this request to be
accepted. If this attribute is not specified, all requests will be
@@ -323,7 +323,7 @@
</attribute>
<attribute name="deny" required="false">
- <p>A regular expression (using <code>java.util.Regex</code>) that the
+ <p>A regular expression (using <code>java.util.regex</code>) that the
remote client's hostname is compared to. If this attribute
is specified, the remote hostname MUST NOT match for this request to be
accepted. If this attribute is not specified, request acceptance is
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
