Mercurial > hg > nginx-vendor-current
comparison src/core/ngx_regex.c @ 654:753f505670e0 NGINX_1_1_11
nginx 1.1.11
*) Feature: the "so_keepalive" parameter of the "listen" directive.
Thanks to Vsevolod Stakhov.
*) Feature: the "if_not_empty" parameter of the
"fastcgi/scgi/uwsgi_param" directives.
*) Feature: the $https variable.
*) Feature: the "proxy_redirect" directive supports variables in the
first parameter.
*) Feature: the "proxy_redirect" directive supports regular expressions.
*) Bugfix: the $sent_http_cache_control variable might contain a wrong
value if the "expires" directive was used.
Thanks to Yichun Zhang.
*) Bugfix: the "read_ahead" directive might not work combined with
"try_files" and "open_file_cache".
*) Bugfix: a segmentation fault might occur in a worker process if small
time was used in the "inactive" parameter of the "proxy_cache_path"
directive.
*) Bugfix: responses from cache might hang.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 12 Dec 2011 00:00:00 +0400 |
parents | 697030d79811 |
children | 9d21dad0b5a1 |
comparison
equal
deleted
inserted
replaced
653:8c96af2112c1 | 654:753f505670e0 |
---|---|
135 return NGX_OK; | 135 return NGX_OK; |
136 } | 136 } |
137 | 137 |
138 | 138 |
139 ngx_int_t | 139 ngx_int_t |
140 ngx_regex_capture_count(ngx_regex_t *re) | |
141 { | |
142 int rc, n; | |
143 | |
144 n = 0; | |
145 | |
146 rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n); | |
147 | |
148 if (rc < 0) { | |
149 return (ngx_int_t) rc; | |
150 } | |
151 | |
152 return (ngx_int_t) n; | |
153 } | |
154 | |
155 | |
156 ngx_int_t | |
157 ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log) | 140 ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log) |
158 { | 141 { |
159 ngx_int_t n; | 142 ngx_int_t n; |
160 ngx_uint_t i; | 143 ngx_uint_t i; |
161 ngx_regex_elt_t *re; | 144 ngx_regex_elt_t *re; |