comparison src/http/ngx_http_variables.h @ 509:9b8c906f6e63 release-0.1.29

nginx-0.1.29-RELEASE import *) Feature: the ngx_http_ssi_module supports "include virtual" command. *) Feature: the ngx_http_ssi_module supports the condition command like 'if expr="$NAME"' and "else" and "endif" commands. Only one nested level is supported. *) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and DATE_GMT variables and "config timefmt" command. *) Feature: the "ssi_ignore_recycled_buffers" directive. *) Bugfix: the "echo" command did not show the default value for the empty QUERY_STRING variable. *) Change: the ngx_http_proxy_module was rewritten. *) Feature: the "proxy_redirect", "proxy_pass_request_headers", "proxy_pass_request_body", and "proxy_method" directives. *) Feature: the "proxy_set_header" directive. The "proxy_x_var" was canceled and must be replaced with the proxy_set_header directive. *) Change: the "proxy_preserve_host" is canceled and must be replaced with the "proxy_set_header Host $host" and the "proxy_redirect off" directives, the "proxy_set_header Host $host:$proxy_port" directive and the appropriate proxy_redirect directives. *) Change: the "proxy_set_x_real_ip" is canceled and must be replaced with the "proxy_set_header X-Real-IP $remote_addr" directive. *) Change: the "proxy_add_x_forwarded_for" is canceled and must be replaced with the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for" directive. *) Change: the "proxy_set_x_url" is canceled and must be replaced with the "proxy_set_header X-URL http://$host:$server_port$request_uri" directive. *) Feature: the "fastcgi_param" directive. *) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params" directive are canceled and must be replaced with the fastcgi_param directives. *) Feature: the "index" directive can use the variables. *) Feature: the "index" directive can be used at http and server levels. *) Change: the last index only in the "index" directive can be absolute. *) Feature: the "rewrite" directive can use the variables. *) Feature: the "internal" directive. *) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR, SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME, REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables. *) Change: nginx now passes the invalid lines in a client request headers or a backend response header. *) Bugfix: if the backend did not transfer response for a long time and the "send_timeout" was less than "proxy_read_timeout", then nginx returned the 408 response. *) Bugfix: the segmentation fault was occurred if the backend sent an invalid line in response header; the bug had appeared in 0.1.26. *) Bugfix: the segmentation fault may occurred in FastCGI fault tolerance configuration. *) Bugfix: the "expires" directive did not remove the previous "Expires" and "Cache-Control" headers. *) Bugfix: nginx did not take into account trailing dot in "Host" header line. *) Bugfix: the ngx_http_auth_module did not work under Linux. *) Bugfix: the rewrite directive worked incorrectly, if the arguments were in a request. *) Bugfix: nginx could not be built on MacOS X.
author Igor Sysoev <igor@sysoev.ru>
date Thu, 12 May 2005 14:58:06 +0000
parents d4ea69372b94
children 12234c998d83
comparison
equal deleted inserted replaced
508:ca1020ce99ba 509:9b8c906f6e63
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_VARIABLE_NOT_FOUND (ngx_http_variable_value_t *) -1 17 #define NGX_HTTP_VAR_NOT_FOUND (ngx_http_variable_value_t *) -1
18 18
19 19
20 struct ngx_http_variable_value_s { 20 typedef struct {
21 ngx_uint_t value; 21 ngx_uint_t value;
22 ngx_str_t text; 22 ngx_str_t text;
23 }; 23 } ngx_http_variable_value_t;
24 24
25 typedef struct ngx_http_variable_s ngx_http_variable_t; 25 typedef struct ngx_http_variable_s ngx_http_variable_t;
26 26
27 typedef ngx_http_variable_value_t * 27 typedef ngx_http_variable_value_t *
28 (*ngx_http_get_variable_pt) (ngx_http_request_t *r, uintptr_t data); 28 (*ngx_http_get_variable_pt) (ngx_http_request_t *r, uintptr_t data);
29 29
30 30
31 #define NGX_HTTP_VAR_CHANGABLE 1
32 #define NGX_HTTP_VAR_NOCACHABLE 2
33
34
31 struct ngx_http_variable_s { 35 struct ngx_http_variable_s {
32 ngx_str_t name; 36 ngx_str_t name; /* must be first to build the hash */
33 ngx_uint_t index;
34 ngx_http_get_variable_pt handler; 37 ngx_http_get_variable_pt handler;
35 uintptr_t data; 38 uintptr_t data;
39 ngx_uint_t flags;
36 }; 40 };
37 41
38 42
39 typedef struct {
40 ngx_str_t name;
41 ngx_http_get_variable_pt handler;
42 uintptr_t data;
43 } ngx_http_core_variable_t;
44
45
46 ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, 43 ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name,
47 ngx_uint_t set); 44 ngx_uint_t flags);
48 ngx_int_t ngx_http_get_variable_index(ngx_http_core_main_conf_t *cmcf, 45 ngx_int_t ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name);
49 ngx_str_t *name);
50 ngx_http_variable_value_t *ngx_http_get_indexed_variable(ngx_http_request_t *r, 46 ngx_http_variable_value_t *ngx_http_get_indexed_variable(ngx_http_request_t *r,
51 ngx_uint_t index); 47 ngx_uint_t index);
52 ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r, 48 ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r,
53 ngx_str_t *name); 49 ngx_str_t *name);
54 ngx_int_t ngx_http_variables_init(ngx_cycle_t *cycle); 50
51 ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf);
52 ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf);
55 53
56 54
57 #endif /* _NGX_HTTP_VARIABLES_H_INCLUDED_ */ 55 #endif /* _NGX_HTTP_VARIABLES_H_INCLUDED_ */