comparison 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
comparison
equal deleted inserted replaced
121:737953b238a4 122:d25a1d6034f1
12 #include <ngx_core.h> 12 #include <ngx_core.h>
13 #include <ngx_event.h> 13 #include <ngx_event.h>
14 #include <ngx_http.h> 14 #include <ngx_http.h>
15 15
16 16
17 #define NGX_HTTP_VAR_NOT_FOUND (ngx_http_variable_value_t *) -1 17 typedef struct {
18 unsigned len:29;
18 19
20 unsigned valid:1;
21 unsigned no_cachable:1;
22 unsigned not_found:1;
19 23
20 typedef struct { 24 u_char *data;
21 ngx_uint_t value;
22 ngx_str_t text;
23 } ngx_http_variable_value_t; 25 } ngx_http_variable_value_t;
26
27 #define ngx_http_variable(v) { sizeof(v) - 1, 1, 0, 0, (u_char *) v }
24 28
25 typedef struct ngx_http_variable_s ngx_http_variable_t; 29 typedef struct ngx_http_variable_s ngx_http_variable_t;
26 30
27 typedef ngx_http_variable_value_t * 31 typedef ngx_int_t (*ngx_http_get_variable_pt) (ngx_http_request_t *r,
28 (*ngx_http_get_variable_pt) (ngx_http_request_t *r, uintptr_t data); 32 ngx_http_variable_value_t *v, uintptr_t data);
29 33
30 34
31 #define NGX_HTTP_VAR_CHANGABLE 1 35 #define NGX_HTTP_VAR_CHANGABLE 1
32 #define NGX_HTTP_VAR_NOCACHABLE 2 36 #define NGX_HTTP_VAR_NOCACHABLE 2
33 #define NGX_HTTP_VAR_INDEXED 4 37 #define NGX_HTTP_VAR_INDEXED 4
34 38
35 39
36 struct ngx_http_variable_s { 40 struct ngx_http_variable_s {
37 ngx_str_t name; /* must be first to build the hash */ 41 ngx_str_t name; /* must be first to build the hash */
38 ngx_http_get_variable_pt handler; 42 ngx_http_get_variable_pt handler;
39 uintptr_t data; 43 uintptr_t data;
40 ngx_uint_t flags; 44 ngx_uint_t flags;
41 ngx_uint_t index; 45 ngx_uint_t index;
42 }; 46 };
43 47
44 48
45 ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, 49 ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name,
46 ngx_uint_t flags); 50 ngx_uint_t flags);
47 ngx_int_t ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name); 51 ngx_int_t ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name);
48 ngx_http_variable_value_t *ngx_http_get_indexed_variable(ngx_http_request_t *r, 52 ngx_http_variable_value_t *ngx_http_get_indexed_variable(ngx_http_request_t *r,
49 ngx_uint_t index); 53 ngx_uint_t index);
54 ngx_http_variable_value_t *ngx_http_get_flushed_variable(ngx_http_request_t *r,
55 ngx_uint_t index);
56
50 ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r, 57 ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r,
51 ngx_str_t *name); 58 ngx_str_t *name);
59
60 #define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL;
61
52 62
53 ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf); 63 ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf);
54 ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf); 64 ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf);
55 65
56 66