diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-27 15:31:36 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2007-12-27 15:31:36 +0000 |
| commit | 37acebc32d2a50b11537edd920af3721b93a1ecc (patch) | |
| tree | 5338ea420eec0818d8e123a91973ee90308693f5 /src/core/ngx_regex.h | |
| parent | 73cd30361418f277067c128cedee4990aa72840b (diff) | |
| download | nginx-0.6.23.tar.gz | |
Changes with nginx 0.6.23 27 Dec 2007v0.6.23
*) Change: the "off" parameter in the "ssl_session_cache" directive;
now this is default parameter.
*) Change: the "open_file_cache_retest" directive was renamed to the
"open_file_cache_valid".
*) Feature: the "open_file_cache_min_uses" directive.
*) Feature: the ngx_http_gzip_static_module.
*) Feature: the "gzip_disable" directive.
*) Feature: the "memcached_pass" directive may be used inside the "if"
block.
*) Bugfix: a segmentation fault occurred in worker process, if the
"memcached_pass" and "if" directives were used in the same location.
*) Bugfix: if a "satisfy_any on" directive was used and not all access
and auth modules directives were set, then other given access and
auth directives were not tested;
*) Bugfix: regex parameters in a "valid_referers" directive were not
inherited from previous level.
*) Bugfix: a "post_action" directive did run if a request was completed
with 499 status code.
*) Bugfix: optimization of 16K buffer usage in a SSL connection.
Thanks to Ben Maurer.
*) Bugfix: the STARTTLS in SMTP mode did not work.
Thanks to Oleg Motienko.
*) Bugfix: in HTTPS mode requests might fail with the "bad write retry"
error; bug appeared in 0.5.13.
Diffstat (limited to 'src/core/ngx_regex.h')
| -rw-r--r-- | src/core/ngx_regex.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/ngx_regex.h b/src/core/ngx_regex.h index 430637721..e31470f9f 100644 --- a/src/core/ngx_regex.h +++ b/src/core/ngx_regex.h @@ -20,12 +20,20 @@ typedef pcre ngx_regex_t; +typedef struct { + ngx_regex_t *regex; + u_char *name; +} ngx_regex_elt_t; + + void ngx_regex_init(void); ngx_regex_t *ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options, ngx_pool_t *pool, ngx_str_t *err); ngx_int_t ngx_regex_capture_count(ngx_regex_t *re); ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, int *captures, ngx_int_t size); +ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log); + #define ngx_regex_exec_n "pcre_exec()" #define ngx_regex_capture_count_n "pcre_fullinfo()" |