comparison src/http/ngx_http_script.h @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents be70f83b184f
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
112 112
113 #if (NGX_PCRE) 113 #if (NGX_PCRE)
114 114
115 typedef struct { 115 typedef struct {
116 ngx_http_script_code_pt code; 116 ngx_http_script_code_pt code;
117 ngx_regex_t *regex; 117 ngx_http_regex_t *regex;
118 ngx_array_t *lengths; 118 ngx_array_t *lengths;
119 uintptr_t size; 119 uintptr_t size;
120 uintptr_t ncaptures;
121 uintptr_t status; 120 uintptr_t status;
122 uintptr_t next; 121 uintptr_t next;
123 122
124 uintptr_t test:1; 123 uintptr_t test:1;
125 uintptr_t negative_test:1; 124 uintptr_t negative_test:1;
158 157
159 158
160 typedef struct { 159 typedef struct {
161 ngx_http_script_code_pt code; 160 ngx_http_script_code_pt code;
162 uintptr_t status; 161 uintptr_t status;
163 uintptr_t null; 162 ngx_http_complex_value_t text;
164 } ngx_http_script_return_code_t; 163 } ngx_http_script_return_code_t;
165 164
166 165
167 typedef enum { 166 typedef enum {
168 ngx_http_script_file_plain = 0, 167 ngx_http_script_file_plain = 0,
206 void ngx_http_script_flush_complex_value(ngx_http_request_t *r, 205 void ngx_http_script_flush_complex_value(ngx_http_request_t *r,
207 ngx_http_complex_value_t *val); 206 ngx_http_complex_value_t *val);
208 ngx_int_t ngx_http_complex_value(ngx_http_request_t *r, 207 ngx_int_t ngx_http_complex_value(ngx_http_request_t *r,
209 ngx_http_complex_value_t *val, ngx_str_t *value); 208 ngx_http_complex_value_t *val, ngx_str_t *value);
210 ngx_int_t ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv); 209 ngx_int_t ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv);
210 char *ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
211 void *conf);
212
213
214 ngx_int_t ngx_http_test_predicates(ngx_http_request_t *r,
215 ngx_array_t *predicates);
216 char *ngx_http_set_predicate_slot(ngx_conf_t *cf, ngx_command_t *cmd,
217 void *conf);
211 218
212 ngx_uint_t ngx_http_script_variables_count(ngx_str_t *value); 219 ngx_uint_t ngx_http_script_variables_count(ngx_str_t *value);
213 ngx_int_t ngx_http_script_compile(ngx_http_script_compile_t *sc); 220 ngx_int_t ngx_http_script_compile(ngx_http_script_compile_t *sc);
214 u_char *ngx_http_script_run(ngx_http_request_t *r, ngx_str_t *value, 221 u_char *ngx_http_script_run(ngx_http_request_t *r, ngx_str_t *value,
215 void *code_lengths, size_t reserved, void *code_values); 222 void *code_lengths, size_t reserved, void *code_values);