Mercurial > hg > nginx-vendor-current
annotate src/core/ngx_regex.h @ 676:bfa81a0490a2 NGINX_1_3_1
nginx 1.3.1
*) Security: now nginx/Windows ignores trailing dot in URI path
component, and does not allow URIs with ":$" in it.
Thanks to Vladimir Kochetkov, Positive Research Center.
*) Feature: the "proxy_pass", "fastcgi_pass", "scgi_pass", "uwsgi_pass"
directives, and the "server" directive inside the "upstream" block,
now support IPv6 addresses.
*) Feature: the "resolver" directive now support IPv6 addresses and an
optional port specification.
*) Feature: the "least_conn" directive inside the "upstream" block.
*) Feature: it is now possible to specify a weight for servers while
using the "ip_hash" directive.
*) Bugfix: a segmentation fault might occur in a worker process if the
"image_filter" directive was used; the bug had appeared in 1.3.0.
*) Bugfix: nginx could not be built with ngx_cpp_test_module; the bug
had appeared in 1.1.12.
*) Bugfix: access to variables from SSI and embedded perl module might
not work after reconfiguration.
Thanks to Yichun Zhang.
*) Bugfix: in the ngx_http_xslt_filter_module.
Thanks to Kuramoto Eiji.
*) Bugfix: memory leak if $geoip_org variable was used.
Thanks to Denis F. Latypoff.
*) Bugfix: in the "proxy_cookie_domain" and "proxy_cookie_path"
directives.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 05 Jun 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
660 | 4 * Copyright (C) Nginx, Inc. |
0 | 5 */ |
6 | |
7 | |
8 #ifndef _NGX_REGEX_H_INCLUDED_ | |
9 #define _NGX_REGEX_H_INCLUDED_ | |
10 | |
11 | |
12 #include <ngx_config.h> | |
13 #include <ngx_core.h> | |
14 | |
15 #include <pcre.h> | |
16 | |
17 | |
546 | 18 #define NGX_REGEX_NO_MATCHED PCRE_ERROR_NOMATCH /* -1 */ |
30 | 19 |
20 #define NGX_REGEX_CASELESS PCRE_CASELESS | |
0 | 21 |
656 | 22 |
23 typedef struct { | |
676 | 24 pcre *code; |
656 | 25 pcre_extra *extra; |
26 } ngx_regex_t; | |
0 | 27 |
546 | 28 |
358 | 29 typedef struct { |
546 | 30 ngx_str_t pattern; |
31 ngx_pool_t *pool; | |
32 ngx_int_t options; | |
33 | |
34 ngx_regex_t *regex; | |
35 int captures; | |
36 int named_captures; | |
37 int name_size; | |
38 u_char *names; | |
39 ngx_str_t err; | |
40 } ngx_regex_compile_t; | |
41 | |
42 | |
43 typedef struct { | |
44 ngx_regex_t *regex; | |
45 u_char *name; | |
358 | 46 } ngx_regex_elt_t; |
47 | |
48 | |
48 | 49 void ngx_regex_init(void); |
546 | 50 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc); |
51 | |
52 #define ngx_regex_exec(re, s, captures, size) \ | |
676 | 53 pcre_exec(re->code, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \ |
546 | 54 captures, size) |
55 #define ngx_regex_exec_n "pcre_exec()" | |
56 | |
358 | 57 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log); |
58 | |
0 | 59 |
60 #endif /* _NGX_REGEX_H_INCLUDED_ */ |