Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_regex.h @ 656:9d21dad0b5a1 NGINX_1_1_12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.12 *) Change: a "proxy_pass" directive without URI part now uses changed URI after redirection with the "error_page" directive; Thanks to Lanshun Zhou. *) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock", "proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives. *) Feature: the "pcre_jit" directive. *) Feature: the "if" SSI command supports captures in regular expressions. *) Bugfix: the "if" SSI command did not work inside the "block" command. *) Bugfix: the "limit_conn_log_level" and "limit_req_log_level" directives might not work. *) Bugfix: the "limit_rate" directive did not allow to use full throughput, even if limit value was very high. *) Bugfix: the "sendfile_max_chunk" directive did not work, if the "limit_rate" directive was used. *) Bugfix: a "proxy_pass" directive without URI part always used original request URI if variables were used. *) Bugfix: a "proxy_pass" directive without URI part might use original request after redirection with the "try_files" directive; Thanks to Lanshun Zhou. *) Bugfix: in the ngx_http_scgi_module. *) Bugfix: in the ngx_http_mp4_module. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.1.9.
author Igor Sysoev <http://sysoev.ru>
date Mon, 26 Dec 2011 00:00:00 +0400
parents e19e5f542878
children d0f7a625f27c
comparison
equal deleted inserted replaced
655:189afff6503f 656:9d21dad0b5a1
16 16
17 #define NGX_REGEX_NO_MATCHED PCRE_ERROR_NOMATCH /* -1 */ 17 #define NGX_REGEX_NO_MATCHED PCRE_ERROR_NOMATCH /* -1 */
18 18
19 #define NGX_REGEX_CASELESS PCRE_CASELESS 19 #define NGX_REGEX_CASELESS PCRE_CASELESS
20 20
21 typedef pcre ngx_regex_t; 21
22 typedef struct {
23 pcre *pcre;
24 pcre_extra *extra;
25 } ngx_regex_t;
22 26
23 27
24 typedef struct { 28 typedef struct {
25 ngx_str_t pattern; 29 ngx_str_t pattern;
26 ngx_pool_t *pool; 30 ngx_pool_t *pool;
43 47
44 void ngx_regex_init(void); 48 void ngx_regex_init(void);
45 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc); 49 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc);
46 50
47 #define ngx_regex_exec(re, s, captures, size) \ 51 #define ngx_regex_exec(re, s, captures, size) \
48 pcre_exec(re, NULL, (const char *) (s)->data, (s)->len, 0, 0, \ 52 pcre_exec(re->pcre, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \
49 captures, size) 53 captures, size)
50 #define ngx_regex_exec_n "pcre_exec()" 54 #define ngx_regex_exec_n "pcre_exec()"
51 55
52 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log); 56 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log);
53 57