]> git.kaiwu.me - nginx.git/commit
projects / nginx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ef76b58) | patch
Merge of r4375, r4382:
authorMaxim Dounin <mdounin@mdounin.ru>
Sun, 5 Feb 2012 14:09:46 +0000 (14:09 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Sun, 5 Feb 2012 14:09:46 +0000 (14:09 +0000)
commitea7bed29fdaa35fb9734bfdb01f64dd1401f9ef6
tree785f2582fcf10f1cd64dd12a1705176bb2da8bcdtree | snapshot
parentef76b584da7329ffee1e30286c0bf76b255ad3cccommit | diff
Merge of r4375, r4382:

SSI changes:

*) The "if" command did not work inside the "block" command and
   produced parsing errors.

*) Added regex captures support in the expression of the "if" command.
src/http/modules/ngx_http_ssi_filter_module.c diff | blob | history
src/http/modules/ngx_http_ssi_filter_module.h diff | blob | history
nginx upstream