Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_script.h @ 58:b55cbf18157e NGINX_0_1_29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.29 *) 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; bug 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 <http://sysoev.ru>
date Thu, 12 May 2005 00:00:00 +0400
parents 3050baa54a26
children 5db440287648
comparison
equal deleted inserted replaced
57:5df375c55338 58:b55cbf18157e
14 14
15 15
16 typedef struct { 16 typedef struct {
17 u_char *ip; 17 u_char *ip;
18 u_char *pos; 18 u_char *pos;
19 ngx_http_variable_value_t *sp;
20
21 ngx_str_t buf;
22 ngx_str_t *line;
23
24 /* the start of the rewritten arguments */
25 u_char *args;
26
27 unsigned skip:1;
28 unsigned quote:1;
29 unsigned log:1;
30
31 int *captures;
32
33 ngx_int_t status;
19 ngx_http_request_t *request; 34 ngx_http_request_t *request;
20 } ngx_http_script_lite_engine_t; 35 } ngx_http_script_engine_t;
21 36
22 37
23 typedef struct { 38 typedef struct {
24 ngx_http_script_lite_engine_t lite; 39 ngx_conf_t *cf;
25 } ngx_http_script_engine_t; 40 ngx_str_t *source;
41 ngx_array_t **lengths;
42 ngx_array_t **values;
43
44 ngx_uint_t variables;
45 ngx_uint_t ncaptures;
46 ngx_uint_t size;
47
48 void *main;
49
50 unsigned compile_args:1;
51 unsigned compile_null:1;
52 unsigned complete_lengths:1;
53 unsigned complete_values:1;
54
55 unsigned args:1;
56 } ngx_http_script_compile_t;
26 57
27 58
28 typedef void (*ngx_http_script_code_pt) (ngx_http_script_engine_t *e); 59 typedef void (*ngx_http_script_code_pt) (ngx_http_script_engine_t *e);
29 typedef size_t (*ngx_http_script_len_code_pt) 60 typedef size_t (*ngx_http_script_len_code_pt) (ngx_http_script_engine_t *e);
30 (ngx_http_script_lite_engine_t *e);
31
32 typedef ngx_int_t (*ngx_http_script_compile_lite_start_pt) (ngx_table_elt_t *h,
33 ngx_array_t *lengths, ngx_array_t *values, ngx_uint_t value);
34 typedef ngx_int_t (*ngx_http_script_compile_lite_end_pt) (ngx_array_t *lengths,
35 ngx_array_t *values);
36 61
37 62
38 typedef struct { 63 typedef struct {
39 ngx_http_script_code_pt code; 64 ngx_http_script_code_pt code;
40 uintptr_t len; 65 uintptr_t len;
45 ngx_http_script_code_pt code; 70 ngx_http_script_code_pt code;
46 uintptr_t index; 71 uintptr_t index;
47 } ngx_http_script_var_code_t; 72 } ngx_http_script_var_code_t;
48 73
49 74
50 ngx_int_t ngx_http_script_compile_lite(ngx_conf_t *cf, ngx_array_t *sources, 75 typedef struct {
51 ngx_array_t **lengths, ngx_array_t **values, 76 ngx_http_script_code_pt code;
52 ngx_http_script_compile_lite_start_pt start, 77 uintptr_t n;
53 ngx_http_script_compile_lite_end_pt end); 78 } ngx_http_script_copy_capture_code_t;
54 79
55 80
56 static void *ngx_http_script_start_code(ngx_pool_t *pool, ngx_array_t **codes, 81 typedef struct {
82 ngx_http_script_code_pt code;
83 ngx_regex_t *regex;
84 ngx_array_t *lengths;
85 uintptr_t size;
86 uintptr_t ncaptures;
87 uintptr_t status;
88 uintptr_t next;
89
90 uintptr_t test:1;
91 uintptr_t uri:1;
92 uintptr_t args:1;
93
94 /* add the r->args to the new arguments */
95 uintptr_t add_args:1;
96
97 uintptr_t redirect:1;
98 uintptr_t break_cycle:1;
99
100 ngx_str_t name;
101 } ngx_http_script_regex_code_t;
102
103
104 typedef struct {
105 ngx_http_script_code_pt code;
106
107 uintptr_t uri:1;
108 uintptr_t args:1;
109
110 /* add the r->args to the new arguments */
111 uintptr_t add_args:1;
112
113 uintptr_t redirect:1;
114 } ngx_http_script_regex_end_code_t;
115
116
117 typedef struct {
118 ngx_http_script_code_pt code;
119 uintptr_t status;
120 uintptr_t null;
121 } ngx_http_script_return_code_t;
122
123
124 typedef struct {
125 ngx_http_script_code_pt code;
126 uintptr_t next;
127 void **loc_conf;
128 } ngx_http_script_if_code_t;
129
130
131 typedef struct {
132 ngx_http_script_code_pt code;
133 uintptr_t value;
134 uintptr_t text_len;
135 uintptr_t text_data;
136 } ngx_http_script_value_code_t;
137
138
139 ngx_uint_t ngx_http_script_variables_count(ngx_str_t *value);
140 ngx_int_t ngx_http_script_compile(ngx_http_script_compile_t *sc);
141
142 void *ngx_http_script_start_code(ngx_pool_t *pool, ngx_array_t **codes,
57 size_t size); 143 size_t size);
144 void *ngx_http_script_add_code(ngx_array_t *codes, size_t size, void *code);
58 145
59 size_t ngx_http_script_copy_len(ngx_http_script_engine_t *e); 146 size_t ngx_http_script_copy_len_code(ngx_http_script_engine_t *e);
60 void ngx_http_script_copy(ngx_http_script_engine_t *e); 147 void ngx_http_script_copy_code(ngx_http_script_engine_t *e);
61 size_t ngx_http_script_copy_var_len(ngx_http_script_engine_t *e); 148 size_t ngx_http_script_copy_var_len_code(ngx_http_script_engine_t *e);
62 void ngx_http_script_copy_var(ngx_http_script_engine_t *e); 149 void ngx_http_script_copy_var_code(ngx_http_script_engine_t *e);
63 150 size_t ngx_http_script_copy_capture_len_code(ngx_http_script_engine_t *e);
151 void ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e);
152 void ngx_http_script_regex_start_code(ngx_http_script_engine_t *e);
153 void ngx_http_script_regex_end_code(ngx_http_script_engine_t *e);
154 void ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e);
155 void ngx_http_script_start_args_code(ngx_http_script_engine_t *e);
156 void ngx_http_script_return_code(ngx_http_script_engine_t *e);
157 void ngx_http_script_if_code(ngx_http_script_engine_t *e);
158 void ngx_http_script_value_code(ngx_http_script_engine_t *e);
159 void ngx_http_script_set_var_code(ngx_http_script_engine_t *e);
160 void ngx_http_script_var_code(ngx_http_script_engine_t *e);
161 void ngx_http_script_nop_code(ngx_http_script_engine_t *e);
64 162
65 163
66 #endif /* _NGX_HTTP_SCRIPT_H_INCLUDED_ */ 164 #endif /* _NGX_HTTP_SCRIPT_H_INCLUDED_ */