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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 /*
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3 * Copyright (C) Igor Sysoev
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4 */
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 #ifndef _NGX_REGEX_H_INCLUDED_
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 #define _NGX_REGEX_H_INCLUDED_
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11 #include <ngx_config.h>
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 #include <ngx_core.h>
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 #include <pcre.h>
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16
546
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
17 #define NGX_REGEX_NO_MATCHED PCRE_ERROR_NOMATCH /* -1 */
30
e1ada20fc595 nginx 0.1.15
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
18
e1ada20fc595 nginx 0.1.15
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
19 #define NGX_REGEX_CASELESS PCRE_CASELESS
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20
656
9d21dad0b5a1 nginx 1.1.12
Igor Sysoev <http://sysoev.ru>
parents: 546
diff changeset
21
9d21dad0b5a1 nginx 1.1.12
Igor Sysoev <http://sysoev.ru>
parents: 546
diff changeset
22 typedef struct {
9d21dad0b5a1 nginx 1.1.12
Igor Sysoev <http://sysoev.ru>
parents: 546
diff changeset
23 pcre *pcre;
9d21dad0b5a1 nginx 1.1.12
Igor Sysoev <http://sysoev.ru>
parents: 546
diff changeset
24 pcre_extra *extra;
9d21dad0b5a1 nginx 1.1.12
Igor Sysoev <http://sysoev.ru>
parents: 546
diff changeset
25 } ngx_regex_t;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26
546
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
27
358
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
28 typedef struct {
546
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
29 ngx_str_t pattern;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
30 ngx_pool_t *pool;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
31 ngx_int_t options;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
32
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
33 ngx_regex_t *regex;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
34 int captures;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
35 int named_captures;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
36 int name_size;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
37 u_char *names;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
38 ngx_str_t err;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
39 } ngx_regex_compile_t;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
40
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
41
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
42 typedef struct {
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
43 ngx_regex_t *regex;
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
44 u_char *name;
358
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
45 } ngx_regex_elt_t;
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
46
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
47
48
6cfc63e68377 nginx 0.1.24
Igor Sysoev <http://sysoev.ru>
parents: 30
diff changeset
48 void ngx_regex_init(void);
546
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
49 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc);
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
50
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
51 #define ngx_regex_exec(re, s, captures, size) \
656
9d21dad0b5a1 nginx 1.1.12
Igor Sysoev <http://sysoev.ru>
parents: 546
diff changeset
52 pcre_exec(re->pcre, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \
546
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
53 captures, size)
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
54 #define ngx_regex_exec_n "pcre_exec()"
e19e5f542878 nginx 0.8.25
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
55
358
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
56 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log);
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
57
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 #endif /* _NGX_REGEX_H_INCLUDED_ */