From: Eric Covener Date: Sun, 30 Nov 2014 18:16:38 +0000 (+0000) Subject: xforms X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e18b4057f29761596083e94dd74f37581950fd0e;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642585 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index 61b3f341cf6..dfce6ba3791 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -116,7 +116,7 @@ variable ::= "%{" varname "}" rebackref ::= "$" [0-9] -function ::= funcname "(" word ")" +function ::= funcname "(" wordlist ")" listfunction ::= listfuncname "(" word ")" @@ -481,6 +481,9 @@ listfunction ::= listfuncname "(" word ")"ldap Escape characters as required by LDAP distinguished name escaping (RFC4514) and LDAP filter escaping (RFC4515). +replace + replace(string, "from", "to") replaces all occurences of "from" + in the string with "to".

The functions marked as "restricted" are not available in some modules @@ -529,7 +532,7 @@ listfunction ::= listfuncname "(" word ")" - + diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta index d5a2e5e1a51..ea324a8bb25 100644 --- a/docs/manual/expr.xml.meta +++ b/docs/manual/expr.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 6a3d3565060..86e35727699 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -196,6 +196,15 @@ 

Require expr %{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17
+ 
<RequireAll>
+    Require expr "!(%{QUERY_STRING} =~ /secret/)"
+    Require expr "%{REQUEST_URI} in { '/example.cgi' }" 
+</RequireAll>
+ + + 
Require expr "!(%{QUERY_STRING} =~ /secret/) && %{REQUEST_URI} in { '/example.cgi' }"
+ +

The syntax is described in the ap_expr documentation.

diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en index c61d8262bad..f694771588a 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -1009,6 +1009,14 @@ end local line = r:wsread() + +
r:config() -- Get a walkable tree of the entire httpd configuration
+ + +
r:activeconfig() -- Get a walkable tree of the active (virtualhost-specific) httpd configuration
+ + +
top

Logging Functions

diff --git a/docs/manual/mod/mod_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en index 9d0e650bd33..16f265d3c10 100644 --- a/docs/manual/mod/mod_proxy_fcgi.html.en +++ b/docs/manual/mod/mod_proxy_fcgi.html.en @@ -100,7 +100,7 @@

The following example passes the request URI as a filesystem path for the PHP-FPM daemon to run. In this case, PHP-FPM is listening on a unix domain socket (UDS). Requires 2.4.9 or later. With this syntax, - the hostname and optional port following fci:// are ignored.

+ the hostname and optional port following fcgi:// are ignored.

PHP-FPM with UDS

ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/"
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 322ac16fe8a..280b3a31c2d 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -130,6 +130,10 @@ URLs on the fly RewriteRule, suffixed by the relative substitution is also valid as a URL path on the server (this is rare). +
  • In Apache HTTP Server 2.4.11 and later, this directive may be + omitted when the request is mapped via + Alias + or mod_userdir.

    • In the example below, RewriteBase is necessary @@ -138,7 +142,7 @@ URLs on the fly misconfiguration would normally cause the server to look for an "opt" directory under the document root.

    DocumentRoot /var/www/example.com
-Alias /myapp /opt/myapp-1.2.3
+AliasMatch ^/myapp /opt/myapp-1.2.3
 <Directory /opt/myapp-1.2.3>
     RewriteEngine On
     RewriteBase /myapp/
@@ -146,6 +150,7 @@ Alias /myapp /opt/myapp-1.2.3
 </Directory>
    +
    top

    RewriteCond Directive

    @@ -963,8 +968,21 @@ RewriteRule ^/$ /homepage.std.html [L] default behavior in 2.4.0 through 2.4.3, and the flag to restore it is available Apache HTTP Server 2.4.4 and later.

    - +
    IgnoreContextInfo
    +
    + +

    In versions 2.4.11 and later, when a relative substitution is made + in directory (htaccess) context and RewriteBase has not been set, this module uses some + extended URL and filesystem context information to change the + relative substitution back into a URL. Modules such as + mod_userdir and mod_alias + supply this extended context info. This option disable the behavior + introduced in 2.4.11 and should only be set if all of the conditions + above are present and a substituion has an unexpected result.

    +
    + +
    top
    diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index f0f52cb9c32..408669c2bb8 100644 --- a/docs/manual/mod/mod_rewrite.xml.fr +++ b/docs/manual/mod/mod_rewrite.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e8..0be21e86f4d 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ en - fr + fr