From 4d656dcd0bd6309b0ec76fc444198ed6c2948a8e Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 22 Mar 2005 16:02:46 +0000 Subject: nginx-0.1.26-RELEASE import *) Change: the invalid client header lines are now ignored and logged at the info level. *) Change: the server name is also logged in error log. *) Feature: the ngx_http_auth_basic_module module and the auth_basic and auth_basic_user_file directives. --- src/core/ngx_regex.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'src/core/ngx_regex.c') diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c index 12579946b..eda243bec 100644 --- a/src/core/ngx_regex.c +++ b/src/core/ngx_regex.c @@ -8,22 +8,24 @@ #include -static void *ngx_regex_malloc(size_t size); -static void ngx_regex_free(void *p); +static void * ngx_libc_cdecl ngx_regex_malloc(size_t size); +static void ngx_libc_cdecl ngx_regex_free(void *p); static ngx_pool_t *ngx_pcre_pool; -void ngx_regex_init(void) +void +ngx_regex_init(void) { pcre_malloc = ngx_regex_malloc; pcre_free = ngx_regex_free; } -ngx_regex_t *ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options, - ngx_pool_t *pool, ngx_str_t *err) +ngx_regex_t * +ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options, ngx_pool_t *pool, + ngx_str_t *err) { int erroff; const char *errstr; @@ -79,7 +81,8 @@ ngx_regex_t *ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options, } -ngx_int_t ngx_regex_capture_count(ngx_regex_t *re) +ngx_int_t +ngx_regex_capture_count(ngx_regex_t *re) { int rc, n; @@ -95,8 +98,8 @@ 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(ngx_regex_t *re, ngx_str_t *s, int *captures, ngx_int_t size) { int rc; @@ -111,7 +114,8 @@ ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, } -static void *ngx_regex_malloc(size_t size) +static void * ngx_libc_cdecl +ngx_regex_malloc(size_t size) { ngx_pool_t *pool; #if (NGX_THREADS) @@ -135,7 +139,8 @@ static void *ngx_regex_malloc(size_t size) } -static void ngx_regex_free(void *p) +static void ngx_libc_cdecl +ngx_regex_free(void *p) { return; } -- cgit v1.2.3