Mercurial > hg > nginx
changeset 3356:fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 23 Nov 2009 13:13:58 +0000 |
| parents | 0d315506d18c |
| children | fc735aa50b8b |
| files | src/http/ngx_http_variables.c src/http/ngx_http_variables.h |
| diffstat | 2 files changed, 23 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -1666,6 +1666,8 @@ ngx_http_variable_pid(ngx_http_request_t } +#if (NGX_PCRE) + static ngx_int_t ngx_http_variable_not_found(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) @@ -1816,6 +1818,8 @@ ngx_http_regex_exec(ngx_http_request_t * return NGX_OK; } +#endif + ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf)
--- a/src/http/ngx_http_variables.h +++ b/src/http/ngx_http_variables.h @@ -41,21 +41,6 @@ struct ngx_http_variable_s { }; -typedef struct { - ngx_uint_t capture; - ngx_int_t index; -} ngx_http_regex_variable_t; - - -typedef struct { - ngx_regex_t *regex; - ngx_uint_t ncaptures; - ngx_http_regex_variable_t *variables; - ngx_uint_t nvariables; - ngx_str_t name; -} ngx_http_regex_t; - - ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags); ngx_int_t ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name); @@ -74,11 +59,30 @@ ngx_int_t ngx_http_variable_unknown_head #define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL; +#if (NGX_PCRE) + +typedef struct { + ngx_uint_t capture; + ngx_int_t index; +} ngx_http_regex_variable_t; + + +typedef struct { + ngx_regex_t *regex; + ngx_uint_t ncaptures; + ngx_http_regex_variable_t *variables; + ngx_uint_t nvariables; + ngx_str_t name; +} ngx_http_regex_t; + + ngx_http_regex_t *ngx_http_regex_compile(ngx_conf_t *cf, ngx_regex_compile_t *rc); ngx_int_t ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, ngx_str_t *s); +#endif + ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf); ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf);