allow non-operators for "limit" and "timeout", too

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 0f25481ff1a79a7b51a1073eb49e32f96273a6c6..a1ee38f160ea7d6a8d1862baa87205fb54fc6d91 100644 (file)
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -2659,7 +2659,9 @@ check_for_eol:
                 *      'case ::foo' is allowed.  For generality, we just expect that the second argument to
                 *      'case' is not an operator.
                 */
-               if (strcmp(buff[1], "case") == 0) {
+               if ((strcmp(buff[1], "case") == 0) ||
+                   (strcmp(buff[1], "limit") == 0) ||
+                   (strcmp(buff[1], "timeout") == 0)) {
                        break;
                }
 

diff --git a/src/tests/keywords/limit-fail b/src/tests/keywords/limit-fail
new file mode 100644 (file)
index 0000000..ef73bcf
--- /dev/null
+++ b/src/tests/keywords/limit-fail
@@ -0,0 +1,12 @@
+#
+# PRE: limit
+#
+try {
+       limit %test.fail() {
+               success
+       }
+}
+catch fail {
+       success
+}
+