Merge r1362506 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

Use integer operators when comparing to TIME_HOUR

Reported by Florian in comment#124.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362510 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 07f6262d057f9a0f446a57bfa2d5aa7fe63c1ba5..84700a1a543744740dccac47ba1619aba7ab3615 100644 (file)
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -218,7 +218,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
   decisions on arbitrary expressions.</p>
 
     <highlight language="config">
-        Require expr %{TIME_HOUR} &gt;= 9 &amp;&amp; %{TIME_HOUR} &lt;= 17 
+        Require expr %{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17 
     </highlight>
 
   <p>The syntax is described in the <a href="../expr.html">ap_expr</a>

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index b4886465137fddae2f3d4eed14b483489a29fa1c..db93b2103803216a41895d17036c1ffe8a52e0fa 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1402,11 +1402,11 @@ request processing.</p>
 
 <example><title>Example</title>
 <highlight language="config">
-SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/                \
-            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd."        \
-            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"}  \
-            and %{TIME_WDAY} &gt;= 1 and %{TIME_WDAY} &lt;= 5          \
-            and %{TIME_HOUR} &gt;= 8 and %{TIME_HOUR} &lt;= 20       ) \
+SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/                   \
+            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd."          \
+            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"}    \
+            and %{TIME_WDAY} -ge 1 and %{TIME_WDAY} -le 5          \
+            and %{TIME_HOUR} -ge 8 and %{TIME_HOUR} -le 20       ) \
            or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
 </highlight>
 </example>