Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http_variables.h @ 122:d25a1d6034f1 NGINX_0_3_8
nginx 0.3.8
*) 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; bug 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.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Wed, 09 Nov 2005 00:00:00 +0300 |
| parents | 2aa14f638cf0 |
| children | df17fbafec8f |
line wrap: on
line diff
--- a/src/http/ngx_http_variables.h +++ b/src/http/ngx_http_variables.h @@ -14,18 +14,22 @@ #include <ngx_http.h> -#define NGX_HTTP_VAR_NOT_FOUND (ngx_http_variable_value_t *) -1 - +typedef struct { + unsigned len:29; -typedef struct { - ngx_uint_t value; - ngx_str_t text; + unsigned valid:1; + unsigned no_cachable:1; + unsigned not_found:1; + + u_char *data; } ngx_http_variable_value_t; +#define ngx_http_variable(v) { sizeof(v) - 1, 1, 0, 0, (u_char *) v } + typedef struct ngx_http_variable_s ngx_http_variable_t; -typedef ngx_http_variable_value_t * - (*ngx_http_get_variable_pt) (ngx_http_request_t *r, uintptr_t data); +typedef ngx_int_t (*ngx_http_get_variable_pt) (ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); #define NGX_HTTP_VAR_CHANGABLE 1 @@ -34,11 +38,11 @@ typedef ngx_http_variable_value_t * struct ngx_http_variable_s { - ngx_str_t name; /* must be first to build the hash */ - ngx_http_get_variable_pt handler; - uintptr_t data; - ngx_uint_t flags; - ngx_uint_t index; + ngx_str_t name; /* must be first to build the hash */ + ngx_http_get_variable_pt handler; + uintptr_t data; + ngx_uint_t flags; + ngx_uint_t index; }; @@ -47,9 +51,15 @@ ngx_http_variable_t *ngx_http_add_variab ngx_int_t ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name); ngx_http_variable_value_t *ngx_http_get_indexed_variable(ngx_http_request_t *r, ngx_uint_t index); +ngx_http_variable_value_t *ngx_http_get_flushed_variable(ngx_http_request_t *r, + ngx_uint_t index); + ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name); +#define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL; + + 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);