From: kkolinko Date: Sat, 15 Jan 2011 18:54:46 +0000 (+0000) Subject: Update examples for RemoveAddrValve, RemoteHostValve in the docs X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a71eaf7566abd4d0a7c91dbc94b0d759bf0de683;p=tomcat7.0 Update examples for RemoveAddrValve, RemoteHostValve in the docs git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059390 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index ab3bf1705..5f25a7748 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -837,10 +837,9 @@ incoming request directed to the surrounding Engine, Host, or Context 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 Jakarta Regexp - regular expression library. Requests that come from locations that are + will be checked against configured "accept" and/or "deny" + filters, which are defined using java.util.regex Regular + Expression syntax. Requests that come from locations that are not accepted will be rejected with an HTTP "Forbidden" error. Example filter declarations:

@@ -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> diff --git a/webapps/docs/config/engine.xml b/webapps/docs/config/engine.xml index 687006ca1..07ddec48f 100644 --- a/webapps/docs/config/engine.xml +++ b/webapps/docs/config/engine.xml @@ -224,10 +224,9 @@ incoming request directed to the surrounding Engine, Host, or Context 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 Jakarta Regexp - regular expression library. Requests that come from locations that are + will be checked against configured "accept" and/or "deny" + filters, which are defined using java.util.regex Regular + Expression syntax. Requests that come from locations that are not accepted will be rejected with an HTTP "Forbidden" error. Example filter declarations:

@@ -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> diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml index a0373bb7d..e54c00569 100644 --- a/webapps/docs/config/filter.xml +++ b/webapps/docs/config/filter.xml @@ -549,7 +549,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" content-typ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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" with response status "200" content-typ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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" with response status "200" content-typ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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" with response status "200" content-typ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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 diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml index 36069fb41..fc54c735e 100644 --- a/webapps/docs/config/host.xml +++ b/webapps/docs/config/host.xml @@ -519,10 +519,9 @@ incoming request directed to the surrounding Engine, Host, or Context 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 Jakarta Regexp - regular expression library. Requests that come from locations that are + will be checked against configured "accept" and/or "deny" + filters, which are defined using java.util.regex Regular + Expression syntax. Requests that come from locations that are not accepted will be rejected with an HTTP "Forbidden" error. Example filter declarations:

@@ -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> diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index a1e43c71b..52319a71f 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -258,7 +258,7 @@ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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 @@ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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 @@ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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 @@ -

A regular expression (using java.util.Regex) that the +

A regular expression (using java.util.regex) 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