From: Eric Covener
Date: Tue, 17 Jul 2012 14:23:56 +0000 (+0000)
Subject: Use integer operators when comparing to TIME_HOUR
X-Git-Tag: 2.5.0-alpha~6636
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de0b120a23344447a0d8e4b2f5dd448a2bae64de;p=thirdparty%2Fapache%2Fhttpd.git
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/trunk@1362506 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 1f7a48d07e1..70c71a0ac5a 100644
--- 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.
- Require expr %{TIME_HOUR} >= 9 && %{TIME_HOUR} <= 17
+ Require expr %{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17
The syntax is described in the ap_expr
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 98d1b958111..fa4bfef5d44 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1457,11 +1457,11 @@ request processing.
Example
-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} >= 1 and %{TIME_WDAY} <= 5 \
- and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 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]+$/