]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1204087, 1204090:
authorStefan Fritsch <sf@apache.org>
Mon, 21 Nov 2011 22:24:12 +0000 (22:24 +0000)
committerStefan Fritsch <sf@apache.org>
Mon, 21 Nov 2011 22:24:12 +0000 (22:24 +0000)
commit94a5c2e9bcb0fd0cc1976db4b05aa6c3f5949543
treee412eb133176834f5a61a1e62b3ef4d0bcc0932a
parent9bf04f21a991608a8311a68f8494dcf4870e9815
Merge r1204087, 1204090:

Limit recursion in ap_expr evaluation to avoid unbounded stack usage
* evaluate chains of ||, &&, and string concatenation non-recursively
* limit other types of recursion to 20 levels
* avoid some string copies if concatenating more than 2 strings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1204730 13f79535-47bb-0310-9956-ffa450edef68
include/ap_expr.h
include/ap_mmn.h
server/util_expr_eval.c
server/util_expr_parse.c
server/util_expr_parse.y