From 6142b57a31505515925c8c46aea65d3f5d3c3349 Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Sun, 24 Jun 2018 10:30:55 +0000 Subject: [PATCH] documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1834243 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_authz_core.html.en | 16 ++++++++++++++++ docs/manual/mod/mod_authz_core.xml.fr | 2 +- docs/manual/mod/mod_authz_core.xml.meta | 2 +- docs/manual/mod/mod_proxy.html.en | 21 ++++++++++++++------- docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/mod_ssl.html.en | 1 - docs/manual/mod/mod_ssl.xml.es | 2 +- docs/manual/mod/mod_ssl.xml.fr | 2 +- docs/manual/mod/mod_ssl.xml.meta | 2 +- 11 files changed, 38 insertions(+), 16 deletions(-) diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 8c7186392c..a5a74f84a5 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -354,6 +354,22 @@ alias authorization directives that can be referenced by the alias name using the directive Require.

+

If several parameters are needed in Require-Parameters, + they must be enclosed in quotation marks. Otherwise, only the first one + is taken into account.

+ + 
# In this example, for both addresses to be taken into account, they MUST be enclosed
+# between quotation marks
+<AuthzProviderAlias ip blacklisted-ips "XXX.XXX.XXX.XXX YYY.YYY.YYY.YYY">
+</AuthzProviderAlias>
+
+<Directory "/path/to/dir">
+    <RequireAll>
+        Require not blacklisted-ips
+        Require all granted
+    </RequireAll>
+</Directory>
+
top
diff --git a/docs/manual/mod/mod_authz_core.xml.fr b/docs/manual/mod/mod_authz_core.xml.fr index e6647c97b7..cd06d08bc2 100644 --- a/docs/manual/mod/mod_authz_core.xml.fr +++ b/docs/manual/mod/mod_authz_core.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_authz_core.xml.meta b/docs/manual/mod/mod_authz_core.xml.meta index 5023ce74e3..248771933a 100644 --- a/docs/manual/mod/mod_authz_core.xml.meta +++ b/docs/manual/mod/mod_authz_core.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index a4aa39628a..6286d3c961 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -1554,13 +1554,15 @@ ProxyPass "/" "balancer://mycluster/" stickysession=JSESSIONID|jsess httpd 2.4.1 and later) prevents this.

The optional interpolate keyword, in combination with - ProxyPassInterpolateEnv, causes the ProxyPass + ProxyPassInterpolateEnv, causes the ProxyPass to interpolate environment variables, using the syntax ${VARNAME}. Note that many of the standard CGI-derived environment variables will not exist when this interpolation happens, so you may still have to resort to mod_rewrite - for complex rules. Also note that interpolation is not supported - within the scheme/hostname/port portion of a URL. Dynamic determination of + for complex rules. Also note that interpolation is supported + within the scheme/hostname/port portion of a URL only for variables that + are available when the directive is parsed + (like Define). Dynamic determination of those fields can be accomplished with mod_rewrite. The following example describes how to use mod_rewrite to dynamically set the scheme to http or https:

@@ -1623,12 +1625,17 @@ ProxyPassReverse "/mirror/foo/" "https://backend.example.com/" and causes them to substitute the value of an environment variable varname for the string ${varname} in configuration directives if the interpolate option is set.

-

The scheme/hostname/port portion of ProxyPass cannot - contain variables, please consider using mod_rewrite instead.

-

Keep this turned off (for server performance) unless you need it! +

The scheme/hostname/port portion of ProxyPass may + contain variables, but only the ones available when the directive is parsed + (for example, using Define). + For all the other use cases, please consider using + mod_rewrite instead.

+

Performance warning

+

Keep this turned off unless you need it! Adding variables to ProxyPass for example may lead to - using the default mod_proxy's workers configured (that don't allow any fine + the use of the default mod_proxy's workers configured (that don't allow any fine tuning like connections reuse, etc..).

+
top
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index b84c7b0a12..8918654711 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 69a286331c..3e1c25fe4a 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_ssl.xml.meta b/docs/manual/mod/mod_ssl.xml.meta index d50eb9de39..194507ef07 100644 --- a/docs/manual/mod/mod_ssl.xml.meta +++ b/docs/manual/mod/mod_ssl.xml.meta @@ -9,6 +9,6 @@ en es - fr + fr -- 2.50.1