From 09c684b2d53b46b6ffb706c686ca4dbed62cf6da Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 9 Nov 2005 17:25:55 +0000 Subject: nginx-0.3.8-RELEASE import *) Security: nginx now checks URI got from a backend in "X-Accel-Redirect" header line or in SSI file for the "/../" paths and zeroes. *) Change: nginx now does not treat the empty user name in the "Authorization" header line as valid one. *) Feature: the "ssl_session_timeout" directives of the ngx_http_ssl_module and ngx_imap_ssl_module. *) Feature: the "auth_http_header" directive of the ngx_imap_auth_http_module. *) Feature: the "add_header" directive. *) Feature: the ngx_http_realip_module. *) Feature: the new variables to use in the "log_format" directive: $bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri, $request_time, $request_length, $upstream_status, $upstream_response_time, $gzip_ratio, $uid_got, $uid_set, $connection, $pipe, and $msec. The parameters in the "%name" form will be canceled soon. *) Change: now the false variable values in the "if" directive are the empty string "" and string starting with "0". *) Bugfix: while using proxied or FastCGI-server nginx may leave connections and temporary files with client requests in open state. *) Bugfix: the worker processes did not flush the buffered logs on graceful exit. *) Bugfix: if the request URI was changes by the "rewrite" directive and the request was proxied in location given by regular expression, then the incorrect request was transferred to backend; the bug had appeared in 0.2.6. *) Bugfix: the "expires" directive did not remove the previous "Expires" header. *) Bugfix: nginx may stop to accept requests if the "rtsig" method and several worker processes were used. *) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in SSI commands. *) Bugfix: if the response was ended just after the SSI command and gzipping was used, then the response did not transferred complete or did not transferred at all. --- src/http/ngx_http_script.h | 57 +++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 26 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 21625427f..f67b5bee8 100644 --- a/src/http/ngx_http_script.h +++ b/src/http/ngx_http_script.h @@ -14,46 +14,49 @@ typedef struct { - u_char *ip; - u_char *pos; - ngx_http_variable_value_t *sp; + u_char *ip; + u_char *pos; + ngx_http_variable_value_t *sp; - ngx_str_t buf; - ngx_str_t line; + ngx_str_t buf; + ngx_str_t line; /* the start of the rewritten arguments */ - u_char *args; + u_char *args; - unsigned skip:1; - unsigned quote:1; - unsigned log:1; + unsigned flushed:1; + unsigned skip:1; + unsigned quote:1; + unsigned log:1; - int *captures; - ngx_uint_t ncaptures; + int *captures; + ngx_uint_t ncaptures; - ngx_int_t status; - ngx_http_request_t *request; + ngx_int_t status; + ngx_http_request_t *request; } ngx_http_script_engine_t; typedef struct { - ngx_conf_t *cf; - ngx_str_t *source; - ngx_array_t **lengths; - ngx_array_t **values; + ngx_conf_t *cf; + ngx_str_t *source; - ngx_uint_t variables; - ngx_uint_t ncaptures; - ngx_uint_t size; + ngx_array_t **flushes; + ngx_array_t **lengths; + ngx_array_t **values; - void *main; + ngx_uint_t variables; + ngx_uint_t ncaptures; + ngx_uint_t size; - unsigned compile_args:1; - unsigned compile_null:1; - unsigned complete_lengths:1; - unsigned complete_values:1; + void *main; - unsigned args:1; + unsigned compile_args:1; + unsigned compile_null:1; + unsigned complete_lengths:1; + unsigned complete_values:1; + + unsigned args:1; } ngx_http_script_compile_t; @@ -149,6 +152,8 @@ typedef struct { ngx_uint_t ngx_http_script_variables_count(ngx_str_t *value); ngx_int_t ngx_http_script_compile(ngx_http_script_compile_t *sc); +void ngx_http_script_flush_no_cachable_variables(ngx_http_request_t *r, + ngx_array_t *indices); void *ngx_http_script_start_code(ngx_pool_t *pool, ngx_array_t **codes, size_t size); -- cgit