From 090ebb24fee8e90904b3c7ab49dbaa7b7ac3ee9d Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Sun, 1 Apr 2018 07:35:32 +0000 Subject: [PATCH] documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828129 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.en | 8 ++------ docs/manual/mod/core.xml.meta | 2 -- docs/manual/mod/mod_proxy.html.en | 27 +++++++++++++++++++------ docs/manual/rewrite/rewritemap.html.en | 5 +++++ docs/manual/rewrite/rewritemap.xml.fr | 2 +- docs/manual/rewrite/rewritemap.xml.meta | 2 +- 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 68f0ac9eda..7206d845f5 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -26,9 +26,7 @@

Apache Core Features

-

Available Languages:  2  | - de  | - edited  | +

Available Languages:  de  |  en  |  es  |  fr  | @@ -4934,9 +4932,7 @@ hostname or IP address

-

Available Languages:  2  | - de  | - edited  | +

Available Languages:  de  |  en  |  es  |  fr  | diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta index 50b79a342a..b9d96ee4c5 100644 --- a/docs/manual/mod/core.xml.meta +++ b/docs/manual/mod/core.xml.meta @@ -7,9 +7,7 @@ .. - 2 de - edited en es fr diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index fc923df329..612b042fda 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -1067,6 +1067,18 @@ ProxyPass "/mirror/foo" "http://backend.example.com" backend.example.com except requests made to /mirror/foo/i.

+

Mixing ProxyPass settings in different contexts does not work:

+ 
ProxyPass "/mirror/foo/i" "!"
+<Location "/mirror/foo/">
+    ProxyPass "http://backend.example.com/"
+</Location>
+ +

In this case, a request to /mirror/foo/i will get proxied, + because the ProxyPass directive in the Location block will be evaluated + first. The fact that ProxyPass supports both server and directory contexts + does not mean that their scope and position in the configuration file will + guarantee any ordering or override.

+

Ordering ProxyPass Directives

The configured ProxyPass and ProxyPassMatch @@ -1075,12 +1087,15 @@ ProxyPass "/mirror/foo" "http://backend.example.com" ProxyPass rules starting with the longest URLs first. Otherwise, later rules for longer URLS will be hidden by any earlier rule which uses a leading substring of the URL. Note that - there is some relation with worker sharing. In contrast, only one - ProxyPass directive can be placed - in a Location block, and the most - specific location will take precedence.

- -

For the same reasons, exclusions must come before the + there is some relation with worker sharing.

+
+

Ordering ProxyPass Directives in Locations

+

Only one ProxyPass directive + can be placed in a Location block, + and the most specific location will take precedence.

+
+

Exclusions and the no-proxy environment variable

+

Exclusions must come before the general ProxyPass directives. In 2.4.26 and later, the "no-proxy" environment variable is an alternative to exclusions, and is the only way to configure an exclusion of a ProxyPass diff --git a/docs/manual/rewrite/rewritemap.html.en b/docs/manual/rewrite/rewritemap.html.en index 063d02f9a9..749aecaf59 100644 --- a/docs/manual/rewrite/rewritemap.html.en +++ b/docs/manual/rewrite/rewritemap.html.en @@ -430,6 +430,11 @@ this process, or if the script itself is very slow.

Example

RewriteMap myquery "fastdbd:SELECT destination FROM rewrite WHERE source = %s"
+

Note

+

The query name is passed to the database driver as a label for + an SQL prepared statement, and will therefore need to follow any rules + (such as case-sensitivity) required for your database.

+
top

Summary

diff --git a/docs/manual/rewrite/rewritemap.xml.fr b/docs/manual/rewrite/rewritemap.xml.fr index 78e52c3570..d850002d3f 100644 --- a/docs/manual/rewrite/rewritemap.xml.fr +++ b/docs/manual/rewrite/rewritemap.xml.fr @@ -1,7 +1,7 @@ - +