]> git.kaiwu.me - nginx.git/commit
projects / nginx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6a86b4d) | patch
Merge of r4381, r4400:
authorMaxim Dounin <mdounin@mdounin.ru>
Sun, 5 Feb 2012 15:47:58 +0000 (15:47 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Sun, 5 Feb 2012 15:47:58 +0000 (15:47 +0000)
commitd7ccc61da1513f51c4067928d736630415e75afe
treefa8f1f945d8987eb0e8ff43f48bdcb3541ffd99btree | snapshot
parent6a86b4d6626c8285e36c36de22c9db9bc17d3943commit | diff
Merge of r4381, r4400:

Fixed limit_conn_log_level/limit_req_log_level inheritance.  The
directives did not work if there were no limit_conn/limit_req
specified on the same level.

The code for limit_conn is different in 1.0.x, conflict resolved
manually.
src/http/modules/ngx_http_limit_req_module.c diff | blob | history
src/http/modules/ngx_http_limit_zone_module.c diff | blob | history
nginx upstream