From 4959ec482e14884e6c132ed0533c6d62bcc89405 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 23 May 2005 12:07:45 +0000 Subject: nginx-0.1.33-RELEASE import *) Bugfix: nginx could not be built with the --without-pcre parameter; the bug had appeared in 0.1.29. *) Bugfix: 3, 4, 7, and 8 the "proxy_set_header" directives in one level cause the bus fault on start up. *) Bugfix: the HTTP protocol was specified in the HTTPS redirects. *) Bugfix: if the "rewrite" directive used the captures inside the "if" directive, then the 500 error code was returned. --- src/http/ngx_http_script.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/http/ngx_http_script.h') diff --git a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h index cf80f22b4..eb6f17ea9 100644 --- a/src/http/ngx_http_script.h +++ b/src/http/ngx_http_script.h @@ -79,6 +79,8 @@ typedef struct { } ngx_http_script_copy_capture_code_t; +#if (NGX_PCRE) + typedef struct { ngx_http_script_code_pt code; ngx_regex_t *regex; @@ -114,6 +116,8 @@ typedef struct { uintptr_t redirect:1; } ngx_http_script_regex_end_code_t; +#endif + typedef struct { ngx_http_script_code_pt code; @@ -156,10 +160,11 @@ size_t ngx_http_script_copy_var_len_code(ngx_http_script_engine_t *e); void ngx_http_script_copy_var_code(ngx_http_script_engine_t *e); size_t ngx_http_script_copy_capture_len_code(ngx_http_script_engine_t *e); void ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e); +void ngx_http_script_start_args_code(ngx_http_script_engine_t *e); +#if (NGX_PCRE) void ngx_http_script_regex_start_code(ngx_http_script_engine_t *e); void ngx_http_script_regex_end_code(ngx_http_script_engine_t *e); -void ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e); -void ngx_http_script_start_args_code(ngx_http_script_engine_t *e); +#endif void ngx_http_script_return_code(ngx_http_script_engine_t *e); void ngx_http_script_if_code(ngx_http_script_engine_t *e); void ngx_http_script_complex_value_code(ngx_http_script_engine_t *e); -- cgit