Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_regex.h @ 546:e19e5f542878 NGINX_0_8_25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.25 *) Change: now no message is written in an error log if a variable is not found by $r->variable() method. *) Feature: the ngx_http_degradation_module. *) Feature: regular expression named captures. *) Feature: now URI part is not required a "proxy_pass" directive if variables are used. *) Feature: now the "msie_padding" directive works for Chrome too. *) Bugfix: a segmentation fault occurred in a worker process on low memory condition; the bug had appeared in 0.8.18. *) Bugfix: nginx sent gzipped responses to clients those do not support gzip, if "gzip_static on" and "gzip_vary off"; the bug had appeared in 0.8.16.
author Igor Sysoev <http://sysoev.ru>
date Mon, 16 Nov 2009 00:00:00 +0300
parents 9121a0a91f47
children 9d21dad0b5a1
comparison
equal deleted inserted replaced
545:91e4b06e1a01 546:e19e5f542878
12 #include <ngx_core.h> 12 #include <ngx_core.h>
13 13
14 #include <pcre.h> 14 #include <pcre.h>
15 15
16 16
17 #define NGX_REGEX_NO_MATCHED -1000 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 typedef pcre ngx_regex_t;
22 22
23
23 typedef struct { 24 typedef struct {
24 ngx_regex_t *regex; 25 ngx_str_t pattern;
25 u_char *name; 26 ngx_pool_t *pool;
27 ngx_int_t options;
28
29 ngx_regex_t *regex;
30 int captures;
31 int named_captures;
32 int name_size;
33 u_char *names;
34 ngx_str_t err;
35 } ngx_regex_compile_t;
36
37
38 typedef struct {
39 ngx_regex_t *regex;
40 u_char *name;
26 } ngx_regex_elt_t; 41 } ngx_regex_elt_t;
27 42
28 43
29 void ngx_regex_init(void); 44 void ngx_regex_init(void);
30 ngx_regex_t *ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options, 45 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc);
31 ngx_pool_t *pool, ngx_str_t *err); 46
32 ngx_int_t ngx_regex_capture_count(ngx_regex_t *re); 47 #define ngx_regex_exec(re, s, captures, size) \
33 ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, int *captures, 48 pcre_exec(re, NULL, (const char *) (s)->data, (s)->len, 0, 0, \
34 ngx_int_t size); 49 captures, size)
50 #define ngx_regex_exec_n "pcre_exec()"
51
35 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log); 52 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log);
36 53
37 54
38 #define ngx_regex_exec_n "pcre_exec()"
39 #define ngx_regex_capture_count_n "pcre_fullinfo()"
40
41
42 #endif /* _NGX_REGEX_H_INCLUDED_ */ 55 #endif /* _NGX_REGEX_H_INCLUDED_ */