Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssi_filter_module.h @ 4438:2840ff6b97bd stable-1.0
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.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sun, 05 Feb 2012 14:09:46 +0000 |
| parents | 2d8fab47dd89 |
| children | d620f497c50f |
comparison
equal
deleted
inserted
replaced
| 4437:3a1507f48686 | 4438:2840ff6b97bd |
|---|---|
| 62 size_t value_len; | 62 size_t value_len; |
| 63 | 63 |
| 64 ngx_list_t *variables; | 64 ngx_list_t *variables; |
| 65 ngx_array_t *blocks; | 65 ngx_array_t *blocks; |
| 66 | 66 |
| 67 #if (NGX_PCRE) | |
| 68 ngx_uint_t ncaptures; | |
| 69 int *captures; | |
| 70 u_char *captures_data; | |
| 71 #endif | |
| 72 | |
| 67 unsigned conditional:2; | 73 unsigned conditional:2; |
| 68 unsigned encoding:2; | 74 unsigned encoding:2; |
| 69 unsigned block:1; | 75 unsigned block:1; |
| 70 unsigned output:1; | 76 unsigned output:1; |
| 71 unsigned output_chosen:1; | 77 unsigned output_chosen:1; |