You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2014/11/30 19:17:33 UTC

svn commit: r1642587 - in /httpd/httpd/branches/2.4.x/docs/manual: expr.xml mod/mod_authz_core.xml

Author: covener
Date: Sun Nov 30 18:17:33 2014
New Revision: 1642587

URL: http://svn.apache.org/r1642587
Log:
Merge r1642581, r1642584 from trunk:

even out some whitespace



add a few more examples per feedback


Modified:
    httpd/httpd/branches/2.4.x/docs/manual/expr.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/expr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/expr.xml?rev=1642587&r1=1642586&r2=1642587&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/expr.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/expr.xml Sun Nov 30 18:17:33 2014
@@ -552,7 +552,7 @@ listfunction ::= listfuncname "<strong>(
 &lt;/Directory&gt;	
 
 # Check a HTTP header for a list of values
-&lt;If "%{HTTP:X-example-header} in { 'foo', 'bar', 'baz'}"&gt;
+&lt;If "%{HTTP:X-example-header} in { 'foo', 'bar', 'baz' }"&gt;
     Header set matched true
 &lt;/If&gt;
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml?rev=1642587&r1=1642586&r2=1642587&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml Sun Nov 30 18:17:33 2014
@@ -231,6 +231,17 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let
         Require expr "%{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17"
     </highlight>
 
+    <highlight language="config">
+&lt;RequireAll&gt;
+    Require expr "!(%{QUERY_STRING} =~ /secret/)"
+    Require expr "%{REQUEST_URI} in { '/example.cgi' }" 
+&lt;/RequireAll&gt;
+    </highlight>
+
+    <highlight language="config">
+        Require expr "!(%{QUERY_STRING} =~ /secret/) &amp;&amp; %{REQUEST_URI} in { '/example.cgi' }" 
+    </highlight>
+
   <p>The syntax is described in the <a href="../expr.html">ap_expr</a>
   documentation.</p>