Mercurial > hg > nginx-vendor-current
annotate src/core/ngx_regex.h @ 656:9d21dad0b5a1 NGINX_1_1_12
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 |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #ifndef _NGX_REGEX_H_INCLUDED_ | |
8 #define _NGX_REGEX_H_INCLUDED_ | |
9 | |
10 | |
11 #include <ngx_config.h> | |
12 #include <ngx_core.h> | |
13 | |
14 #include <pcre.h> | |
15 | |
16 | |
546 | 17 #define NGX_REGEX_NO_MATCHED PCRE_ERROR_NOMATCH /* -1 */ |
30 | 18 |
19 #define NGX_REGEX_CASELESS PCRE_CASELESS | |
0 | 20 |
656 | 21 |
22 typedef struct { | |
23 pcre *pcre; | |
24 pcre_extra *extra; | |
25 } ngx_regex_t; | |
0 | 26 |
546 | 27 |
358 | 28 typedef struct { |
546 | 29 ngx_str_t pattern; |
30 ngx_pool_t *pool; | |
31 ngx_int_t options; | |
32 | |
33 ngx_regex_t *regex; | |
34 int captures; | |
35 int named_captures; | |
36 int name_size; | |
37 u_char *names; | |
38 ngx_str_t err; | |
39 } ngx_regex_compile_t; | |
40 | |
41 | |
42 typedef struct { | |
43 ngx_regex_t *regex; | |
44 u_char *name; | |
358 | 45 } ngx_regex_elt_t; |
46 | |
47 | |
48 | 48 void ngx_regex_init(void); |
546 | 49 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc); |
50 | |
51 #define ngx_regex_exec(re, s, captures, size) \ | |
656 | 52 pcre_exec(re->pcre, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \ |
546 | 53 captures, size) |
54 #define ngx_regex_exec_n "pcre_exec()" | |
55 | |
358 | 56 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log); |
57 | |
0 | 58 |
59 #endif /* _NGX_REGEX_H_INCLUDED_ */ |