ph10 2005/06/01 10:06:46 BST
Modified files:
exim-test-orig/AutoTest/stderr 614
Log:
Update ratelimit test following Tony's tweak.
Revision Changes Path
1.3 +12 -12 exim/exim-test-orig/AutoTest/stderr/614
Index: 614
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/614,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 614 31 May 2005 10:24:19 -0000 1.2
+++ 614 1 Jun 2005 09:06:46 -0000 1.3
@@ -12,7 +12,7 @@
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/strict / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
@@ -23,7 +23,7 @@
>>> using ACL "check_data"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_byte/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_byte/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_byte/strict / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
@@ -45,7 +45,7 @@
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/strict / 10.9.8.7
>>> ratelimit computed rate 1.0
>>> warn: condition test succeeded
LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
@@ -55,7 +55,7 @@
>>> using ACL "check_data"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_byte/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_byte/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_byte/strict / 10.9.8.7
>>> ratelimit computed rate 19.0
>>> warn: condition test succeeded
LOG: 10HmaY-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h
@@ -76,7 +76,7 @@
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
@@ -87,7 +87,7 @@
>>> using ACL "check_data"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / 10.9.8.7
>>> ratelimit found pre-computed rate 0.0
>>> warn: condition test succeeded
LOG: 10HmaZ-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
@@ -108,7 +108,7 @@
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / 10.9.8.7
>>> ratelimit computed rate 1.0
>>> warn: condition test succeeded
LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
@@ -118,7 +118,7 @@
>>> using ACL "check_data"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / 10.9.8.7
>>> ratelimit found pre-computed rate 1.0
>>> warn: condition test succeeded
LOG: 10HmbA-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
@@ -139,7 +139,7 @@
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_rcpt
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_rcpt / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_rcpt / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
@@ -149,7 +149,7 @@
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_rcpt
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_rcpt / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_rcpt / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
@@ -158,7 +158,7 @@
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_rcpt
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_rcpt / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_rcpt / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
@@ -168,7 +168,7 @@
>>> using ACL "check_data"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_conn
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn / 10.9.8.7
+>>> ratelimit condition limit=0 period=3600 key=1h/per_conn / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
