From: Graham Leggett Date: Fri, 3 Jan 2014 22:30:04 +0000 (+0000) Subject: Update transformation. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72838865e98965546eb3628eab1f6b38a3dda40a;p=thirdparty%2Fapache%2Fhttpd.git Update transformation. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1555268 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index d62b961b3c5..3e3b7d803f2 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -972,15 +972,15 @@ the contents of file-system directories matching a regular expression.

From 2.5.0 onwards, named groups and backreferences are captured and - written to the environment with the corresponding name in upper case. - This allows elements of paths to be referenced from within - expressions and modules like + written to the environment with the corresponding name prefixed with + "MATCH_" and in upper case. This allows elements of paths to be referenced + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

-<DirectoryMatch ^/var/www/combined/(?<SITENAME>[^/]+)>
-    require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+<DirectoryMatch ^/var/www/combined/(?<sitename>[^/]+)>
+    require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 </DirectoryMatch>
 
@@ -1819,15 +1819,15 @@ filenames

would match most common Internet graphics formats.

From 2.5.0 onwards, named groups and backreferences are captured and - written to the environment with the corresponding name in upper case. - This allows elements of files to be referenced from within - expressions and modules like + written to the environment with the corresponding name prefixed with + "MATCH_" and in upper case. This allows elements of files to be referenced + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

-<FileMatch ^(?<SITENAME>[^/]+)>
-    require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+<FileMatch ^(?<sitename>[^/]+)>
+    require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 </FileMatch>
 
@@ -2792,15 +2792,15 @@ matching URLs or /special/data.

From 2.5.0 onwards, named groups and backreferences are captured and - written to the environment with the corresponding name in upper case. - This allows elements of URLs to be referenced from within - expressions and modules like + written to the environment with the corresponding name prefixed with + "MATCH_" and in upper case. This allows elements of URLs to be referenced + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

-<LocationMatch ^/combined/(?<SITENAME>[^/]+)>
-    require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+<LocationMatch ^/combined/(?<sitename>[^/]+)>
+    require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 </LocationMatch>
 
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index d1a2d5a365e..f04fa0a9430 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -933,15 +933,15 @@ proxied resources using regular expressions.

From 2.5.0 onwards, named groups and backreferences are captured and - written to the environment with the corresponding name in upper case. - This allows elements of URLs to be referenced from within - expressions and modules like + written to the environment with the corresponding name prefixed with + "MATCH_" and in upper case. This allows elements of URLs to be referenced + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

-<ProxyMatch ^http://(?<SITENAME>[^/]+)>
-    require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+<ProxyMatch ^http://(?<sitename>[^/]+)>
+    require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 </ProxyMatch>
 
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index c0d7ef4a0be..edba50cf32b 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -593,13 +593,18 @@ Alias /myapp /opt/myapp-1.2.3 whether or not it exists, and is a regular file with size greater than zero. -
  • '-U' (is existing URL, via +
  • '-U' (is existing URL, via subrequest)
    Checks whether or not TestString is a valid URL, accessible via all the server's currently-configured access controls for that path. This uses an internal subrequest to do the check, so use it with care - - it can impact your server's performance!

  • + it can impact your server's performance!

    +

    This flag only returns information about things + like access control, authentication, and authorization. This flag + does not return information about the status code the + configured handler (static file, CGI, proxy, etc.) would have + returned.

  • '-x' (has executable permissions)