From 3259e85b7a1ce51d2e65360173c373fcca3609fb Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 19 Jan 2005 13:10:56 +0000 Subject: nginx-0.1.15-RELEASE import *) Bugfix: the error while the connecting to the FastCGI server caused segmentation fault. *) Bugfix: the correct handling of the regular expression, that has different number of the captures and substitutions. *) Feature: the location, that is passed to the FastCGI server, can be regular expression. *) Bugfix: the FastCGI's parameter REQUEST_URI is now passed with the arguments and in the original state. *) Bugfix: the ngx_http_rewrite_module module was required to be built to use the regular expressions in locations. *) Bugfix: the directive "proxy_preserve_host on" adds port 80 to the "Host" headers, if upstream listen on port 80; the bug had appeared in 0.1.14. *) Bugfix: the same paths in autoconfiguration parameters --http-client-body-temp-path=PATH and --http-proxy-temp-path=PATH, or --http-client-body-temp-path=PATH and --http-fastcgi-temp-path=PATH caused segmentation fault. --- src/core/ngx_regex.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/core/ngx_regex.h') diff --git a/src/core/ngx_regex.h b/src/core/ngx_regex.h index f9bf8580f..fb9856780 100644 --- a/src/core/ngx_regex.h +++ b/src/core/ngx_regex.h @@ -14,15 +14,18 @@ #include -#define NGX_REGEX_CASELESS PCRE_CASELESS +#define NGX_REGEX_NO_MATCHED -1000 + +#define NGX_REGEX_CASELESS PCRE_CASELESS typedef pcre ngx_regex_t; void ngx_regex_init(); ngx_regex_t *ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options, ngx_pool_t *pool, ngx_str_t *err); +ngx_uint_t ngx_regex_capture_count(ngx_regex_t *re); ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, - int *matches, ngx_int_t size); + int *captures, ngx_int_t size); #define ngx_regex_exec_n "pcre_exec()" -- cgit