Mercurial > hg > nginx-vendor-current
annotate src/core/ngx_regex.h @ 592:09d5f308901f NGINX_0_8_48
nginx 0.8.48
*) Change: now the "server_name" directive default value is an empty
name "".
Thanks to Gena Makhomed.
*) Change: now the "server_name_in_redirect" directive default value is
"off".
*) Feature: the $geoip_dma_code, $geoip_area_code, and
$geoip_region_name variables.
Thanks to Christine McGonagle.
*) Bugfix: the "proxy_pass", "fastcgi_pass", "uwsgi_pass", and
"scgi_pass" directives were not inherited inside "limit_except"
blocks.
*) Bugfix: the "proxy_cache_min_uses", "fastcgi_cache_min_uses"
"uwsgi_cache_min_uses", and "scgi_cache_min_uses" directives did not
work; the bug had appeared in 0.8.46.
*) Bugfix: the "fastcgi_split_path_info" directive used incorrectly
captures, if only parts of an URI were captured.
Thanks to Yuriy Taraday and Frank Enderle.
*) Bugfix: the "rewrite" directive did not escape a ";" character
during copying from URI to query string.
Thanks to Daisuke Murase.
*) Bugfix: the ngx_http_image_filter_module closed a connection, if an
image was larger than "image_filter_buffer" size.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 03 Aug 2010 00:00:00 +0400 |
parents | e19e5f542878 |
children | 9d21dad0b5a1 |
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 |
21 typedef pcre ngx_regex_t; | |
22 | |
546 | 23 |
358 | 24 typedef struct { |
546 | 25 ngx_str_t pattern; |
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; | |
358 | 41 } ngx_regex_elt_t; |
42 | |
43 | |
48 | 44 void ngx_regex_init(void); |
546 | 45 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc); |
46 | |
47 #define ngx_regex_exec(re, s, captures, size) \ | |
48 pcre_exec(re, NULL, (const char *) (s)->data, (s)->len, 0, 0, \ | |
49 captures, size) | |
50 #define ngx_regex_exec_n "pcre_exec()" | |
51 | |
358 | 52 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log); |
53 | |
0 | 54 |
55 #endif /* _NGX_REGEX_H_INCLUDED_ */ |