Mercurial > hg > nginx-quic
annotate src/http/ngx_http_script.c @ 5324:8ef1722143dc
SPDY: do not reject headers with empty value (ticket #396).
A quote from SPDY draft 2 specification: "The length of each name and
value must be greater than zero. A receiver of a zero-length name or
value must send a RST_STREAM with code PROTOCOL error."
But it appears that Chrome browser allows sending requests over SPDY/2
connection using JavaScript that contain headers with empty values.
For better compatibility across SPDY clients and to be compliant with
HTTP, such headers are no longer rejected.
Also, it is worth noting that in SPDY draft 3 the statement has been
changed so that it permits empty values for headers.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Thu, 15 Aug 2013 19:16:09 +0400 |
| parents | f1a91825730a |
| children | 314c3d7cc3a5 |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
5 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
6 |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_config.h> |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 #include <ngx_core.h> |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 #include <ngx_http.h> |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
12 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
13 static ngx_int_t ngx_http_script_init_arrays(ngx_http_script_compile_t *sc); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
14 static ngx_int_t ngx_http_script_done(ngx_http_script_compile_t *sc); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
15 static ngx_int_t ngx_http_script_add_copy_code(ngx_http_script_compile_t *sc, |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
16 ngx_str_t *value, ngx_uint_t last); |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
17 static ngx_int_t ngx_http_script_add_var_code(ngx_http_script_compile_t *sc, |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
18 ngx_str_t *name); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
19 static ngx_int_t ngx_http_script_add_args_code(ngx_http_script_compile_t *sc); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
20 #if (NGX_PCRE) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
21 static ngx_int_t ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc, |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
22 ngx_uint_t n); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
23 #endif |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
24 static ngx_int_t |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
25 ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
26 static size_t ngx_http_script_full_name_len_code(ngx_http_script_engine_t *e); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
27 static void ngx_http_script_full_name_code(ngx_http_script_engine_t *e); |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
28 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
29 |
| 509 | 30 #define ngx_http_script_exit (u_char *) &ngx_http_script_exit_code |
| 31 | |
| 32 static uintptr_t ngx_http_script_exit_code = (uintptr_t) NULL; | |
| 33 | |
| 34 | |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
35 void |
|
2609
ad99a49cd313
rename ngx_http_scrip_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2608
diff
changeset
|
36 ngx_http_script_flush_complex_value(ngx_http_request_t *r, |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
37 ngx_http_complex_value_t *val) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
38 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
39 ngx_uint_t *index; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
40 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
41 index = val->flushes; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
42 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
43 if (index) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
44 while (*index != (ngx_uint_t) -1) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
45 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
46 if (r->variables[*index].no_cacheable) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
47 r->variables[*index].valid = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
48 r->variables[*index].not_found = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
49 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
50 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
51 index++; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
52 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
53 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
54 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
55 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
56 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
57 ngx_int_t |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
58 ngx_http_complex_value(ngx_http_request_t *r, ngx_http_complex_value_t *val, |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
59 ngx_str_t *value) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
60 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
61 size_t len; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
62 ngx_http_script_code_pt code; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
63 ngx_http_script_len_code_pt lcode; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
64 ngx_http_script_engine_t e; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
65 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
66 if (val->lengths == NULL) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
67 *value = val->value; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
68 return NGX_OK; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
69 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
70 |
|
2609
ad99a49cd313
rename ngx_http_scrip_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2608
diff
changeset
|
71 ngx_http_script_flush_complex_value(r, val); |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
72 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
73 ngx_memzero(&e, sizeof(ngx_http_script_engine_t)); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
74 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
75 e.ip = val->lengths; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
76 e.request = r; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
77 e.flushed = 1; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
78 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
79 len = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
80 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
81 while (*(uintptr_t *) e.ip) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
82 lcode = *(ngx_http_script_len_code_pt *) e.ip; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
83 len += lcode(&e); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
84 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
85 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
86 value->len = len; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
87 value->data = ngx_pnalloc(r->pool, len); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
88 if (value->data == NULL) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
89 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
90 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
91 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
92 e.ip = val->values; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
93 e.pos = value->data; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
94 e.buf = *value; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
95 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
96 while (*(uintptr_t *) e.ip) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
97 code = *(ngx_http_script_code_pt *) e.ip; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
98 code((ngx_http_script_engine_t *) &e); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
99 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
100 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
101 *value = e.buf; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
102 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
103 return NGX_OK; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
104 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
105 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
106 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
107 ngx_int_t |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
108 ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
109 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
110 ngx_str_t *v; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
111 ngx_uint_t i, n, nv, nc; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
112 ngx_array_t flushes, lengths, values, *pf, *pl, *pv; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
113 ngx_http_script_compile_t sc; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
114 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
115 v = ccv->value; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
116 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
117 nv = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
118 nc = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
119 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
120 for (i = 0; i < v->len; i++) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
121 if (v->data[i] == '$') { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
122 if (v->data[i + 1] >= '1' && v->data[i + 1] <= '9') { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
123 nc++; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
124 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
125 } else { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
126 nv++; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
127 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
128 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
129 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
130 |
|
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4617
diff
changeset
|
131 if ((v->len == 0 || v->data[0] != '$') |
|
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4617
diff
changeset
|
132 && (ccv->conf_prefix || ccv->root_prefix)) |
|
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4617
diff
changeset
|
133 { |
|
5317
f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
Valentin Bartenev <vbart@nginx.com>
parents:
5316
diff
changeset
|
134 if (ngx_get_full_name(ccv->cf->pool, |
|
f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
Valentin Bartenev <vbart@nginx.com>
parents:
5316
diff
changeset
|
135 ccv->conf_prefix ? &ccv->cf->cycle->conf_prefix: |
|
f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
Valentin Bartenev <vbart@nginx.com>
parents:
5316
diff
changeset
|
136 &ccv->cf->cycle->prefix, |
|
f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
Valentin Bartenev <vbart@nginx.com>
parents:
5316
diff
changeset
|
137 v) |
|
f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
Valentin Bartenev <vbart@nginx.com>
parents:
5316
diff
changeset
|
138 != NGX_OK) |
|
f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
Valentin Bartenev <vbart@nginx.com>
parents:
5316
diff
changeset
|
139 { |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
140 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
141 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
142 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
143 ccv->conf_prefix = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
144 ccv->root_prefix = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
145 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
146 |
|
2608
2f4a3a4dfd34
fix plain text values using relative path in ngx_http_complex_value(),
Igor Sysoev <igor@sysoev.ru>
parents:
2587
diff
changeset
|
147 ccv->complex_value->value = *v; |
|
2f4a3a4dfd34
fix plain text values using relative path in ngx_http_complex_value(),
Igor Sysoev <igor@sysoev.ru>
parents:
2587
diff
changeset
|
148 ccv->complex_value->flushes = NULL; |
|
2f4a3a4dfd34
fix plain text values using relative path in ngx_http_complex_value(),
Igor Sysoev <igor@sysoev.ru>
parents:
2587
diff
changeset
|
149 ccv->complex_value->lengths = NULL; |
|
2f4a3a4dfd34
fix plain text values using relative path in ngx_http_complex_value(),
Igor Sysoev <igor@sysoev.ru>
parents:
2587
diff
changeset
|
150 ccv->complex_value->values = NULL; |
|
2f4a3a4dfd34
fix plain text values using relative path in ngx_http_complex_value(),
Igor Sysoev <igor@sysoev.ru>
parents:
2587
diff
changeset
|
151 |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
152 if (nv == 0 && nc == 0) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
153 return NGX_OK; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
154 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
155 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
156 n = nv + 1; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
157 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
158 if (ngx_array_init(&flushes, ccv->cf->pool, n, sizeof(ngx_uint_t)) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
159 != NGX_OK) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
160 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
161 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
162 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
163 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
164 n = nv * (2 * sizeof(ngx_http_script_copy_code_t) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
165 + sizeof(ngx_http_script_var_code_t)) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
166 + sizeof(uintptr_t); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
167 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
168 if (ngx_array_init(&lengths, ccv->cf->pool, n, 1) != NGX_OK) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
169 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
170 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
171 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
172 n = (nv * (2 * sizeof(ngx_http_script_copy_code_t) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
173 + sizeof(ngx_http_script_var_code_t)) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
174 + sizeof(uintptr_t) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
175 + v->len |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
176 + sizeof(uintptr_t) - 1) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
177 & ~(sizeof(uintptr_t) - 1); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
178 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
179 if (ngx_array_init(&values, ccv->cf->pool, n, 1) != NGX_OK) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
180 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
181 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
182 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
183 pf = &flushes; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
184 pl = &lengths; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
185 pv = &values; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
186 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
187 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
188 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
189 sc.cf = ccv->cf; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
190 sc.source = v; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
191 sc.flushes = &pf; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
192 sc.lengths = &pl; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
193 sc.values = &pv; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
194 sc.complete_lengths = 1; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
195 sc.complete_values = 1; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
196 sc.zero = ccv->zero; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
197 sc.conf_prefix = ccv->conf_prefix; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
198 sc.root_prefix = ccv->root_prefix; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
199 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
200 if (ngx_http_script_compile(&sc) != NGX_OK) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
201 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
202 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
203 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
204 if (flushes.nelts) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
205 ccv->complex_value->flushes = flushes.elts; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
206 ccv->complex_value->flushes[flushes.nelts] = (ngx_uint_t) -1; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
207 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
208 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
209 ccv->complex_value->lengths = lengths.elts; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
210 ccv->complex_value->values = values.elts; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
211 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
212 return NGX_OK; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
213 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
214 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
215 |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
216 char * |
| 3761 | 217 ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
218 { |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
219 char *p = conf; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
220 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
221 ngx_str_t *value; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
222 ngx_http_complex_value_t **cv; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
223 ngx_http_compile_complex_value_t ccv; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
224 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
225 cv = (ngx_http_complex_value_t **) (p + cmd->offset); |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
226 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
227 if (*cv != NULL) { |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
228 return "duplicate"; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
229 } |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
230 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
231 *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t)); |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
232 if (*cv == NULL) { |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
233 return NGX_CONF_ERROR; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
234 } |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
235 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
236 value = cf->args->elts; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
237 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
238 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
239 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
240 ccv.cf = cf; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
241 ccv.value = &value[1]; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
242 ccv.complex_value = *cv; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
243 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
244 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
245 return NGX_CONF_ERROR; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
246 } |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
247 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
248 return NGX_CONF_OK; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
249 } |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
250 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3691
diff
changeset
|
251 |
|
3691
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
252 ngx_int_t |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
253 ngx_http_test_predicates(ngx_http_request_t *r, ngx_array_t *predicates) |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
254 { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
255 ngx_str_t val; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
256 ngx_uint_t i; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
257 ngx_http_complex_value_t *cv; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
258 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
259 if (predicates == NULL) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
260 return NGX_OK; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
261 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
262 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
263 cv = predicates->elts; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
264 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
265 for (i = 0; i < predicates->nelts; i++) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
266 if (ngx_http_complex_value(r, &cv[i], &val) != NGX_OK) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
267 return NGX_ERROR; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
268 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
269 |
|
3893
5581586480e9
values starting with '0' were incorrectly assumed to be false
Igor Sysoev <igor@sysoev.ru>
parents:
3887
diff
changeset
|
270 if (val.len && (val.len != 1 || val.data[0] != '0')) { |
|
3691
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
271 return NGX_DECLINED; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
272 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
273 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
274 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
275 return NGX_OK; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
276 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
277 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
278 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
279 char * |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
280 ngx_http_set_predicate_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
281 { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
282 char *p = conf; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
283 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
284 ngx_str_t *value; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
285 ngx_uint_t i; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
286 ngx_array_t **a; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
287 ngx_http_complex_value_t *cv; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
288 ngx_http_compile_complex_value_t ccv; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
289 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
290 a = (ngx_array_t **) (p + cmd->offset); |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
291 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
292 if (*a == NGX_CONF_UNSET_PTR) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
293 *a = ngx_array_create(cf->pool, 1, sizeof(ngx_http_complex_value_t)); |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
294 if (*a == NULL) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
295 return NGX_CONF_ERROR; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
296 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
297 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
298 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
299 value = cf->args->elts; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
300 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
301 for (i = 1; i < cf->args->nelts; i++) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
302 cv = ngx_array_push(*a); |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
303 if (cv == NULL) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
304 return NGX_CONF_ERROR; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
305 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
306 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
307 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
308 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
309 ccv.cf = cf; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
310 ccv.value = &value[i]; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
311 ccv.complex_value = cv; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
312 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
313 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
314 return NGX_CONF_ERROR; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
315 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
316 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
317 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
318 return NGX_CONF_OK; |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
319 } |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
320 |
|
55f95e91daed
ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3633
diff
changeset
|
321 |
| 509 | 322 ngx_uint_t |
| 323 ngx_http_script_variables_count(ngx_str_t *value) | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
324 { |
| 509 | 325 ngx_uint_t i, n; |
| 507 | 326 |
| 509 | 327 for (n = 0, i = 0; i < value->len; i++) { |
| 328 if (value->data[i] == '$') { | |
| 329 n++; | |
| 330 } | |
| 507 | 331 } |
| 332 | |
| 509 | 333 return n; |
| 334 } | |
| 335 | |
| 336 | |
| 337 ngx_int_t | |
| 338 ngx_http_script_compile(ngx_http_script_compile_t *sc) | |
| 339 { | |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
340 u_char ch; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
341 ngx_str_t name; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
342 ngx_uint_t i, bracket; |
| 573 | 343 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
344 if (ngx_http_script_init_arrays(sc) != NGX_OK) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
345 return NGX_ERROR; |
| 509 | 346 } |
| 347 | |
| 348 for (i = 0; i < sc->source->len; /* void */ ) { | |
| 349 | |
| 350 name.len = 0; | |
| 351 | |
| 352 if (sc->source->data[i] == '$') { | |
| 353 | |
| 354 if (++i == sc->source->len) { | |
| 355 goto invalid_variable; | |
| 356 } | |
| 357 | |
|
2547
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
358 #if (NGX_PCRE) |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
359 { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
360 ngx_uint_t n; |
|
2547
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
361 |
| 509 | 362 if (sc->source->data[i] >= '1' && sc->source->data[i] <= '9') { |
| 363 | |
| 641 | 364 n = sc->source->data[i] - '0'; |
| 365 | |
| 366 if (sc->captures_mask & (1 << n)) { | |
| 367 sc->dup_capture = 1; | |
| 368 } | |
| 369 | |
| 370 sc->captures_mask |= 1 << n; | |
| 371 | |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
372 if (ngx_http_script_add_capture_code(sc, n) != NGX_OK) { |
| 509 | 373 return NGX_ERROR; |
| 374 } | |
| 375 | |
| 376 i++; | |
| 377 | |
| 378 continue; | |
| 379 } | |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
380 } |
|
2547
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
381 #endif |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
382 |
| 509 | 383 if (sc->source->data[i] == '{') { |
| 384 bracket = 1; | |
| 385 | |
| 386 if (++i == sc->source->len) { | |
| 387 goto invalid_variable; | |
| 388 } | |
| 389 | |
| 390 name.data = &sc->source->data[i]; | |
| 391 | |
| 392 } else { | |
| 393 bracket = 0; | |
| 394 name.data = &sc->source->data[i]; | |
| 395 } | |
| 396 | |
| 397 for ( /* void */ ; i < sc->source->len; i++, name.len++) { | |
| 398 ch = sc->source->data[i]; | |
| 507 | 399 |
| 509 | 400 if (ch == '}' && bracket) { |
| 401 i++; | |
| 402 bracket = 0; | |
| 403 break; | |
| 404 } | |
| 405 | |
| 406 if ((ch >= 'A' && ch <= 'Z') | |
| 407 || (ch >= 'a' && ch <= 'z') | |
| 408 || (ch >= '0' && ch <= '9') | |
| 409 || ch == '_') | |
| 410 { | |
| 411 continue; | |
| 412 } | |
| 413 | |
| 414 break; | |
| 415 } | |
| 416 | |
| 417 if (bracket) { | |
| 418 ngx_conf_log_error(NGX_LOG_EMERG, sc->cf, 0, | |
| 419 "the closing bracket in \"%V\" " | |
| 420 "variable is missing", &name); | |
| 507 | 421 return NGX_ERROR; |
| 422 } | |
| 423 | |
| 509 | 424 if (name.len == 0) { |
| 425 goto invalid_variable; | |
| 426 } | |
| 507 | 427 |
| 509 | 428 sc->variables++; |
| 507 | 429 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
430 if (ngx_http_script_add_var_code(sc, &name) != NGX_OK) { |
| 507 | 431 return NGX_ERROR; |
| 432 } | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
433 |
| 509 | 434 continue; |
| 435 } | |
| 507 | 436 |
| 509 | 437 if (sc->source->data[i] == '?' && sc->compile_args) { |
| 438 sc->args = 1; | |
| 439 sc->compile_args = 0; | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
440 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
441 if (ngx_http_script_add_args_code(sc) != NGX_OK) { |
|
1891
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
442 return NGX_ERROR; |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
443 } |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
444 |
| 509 | 445 i++; |
| 446 | |
| 507 | 447 continue; |
| 448 } | |
| 449 | |
| 509 | 450 name.data = &sc->source->data[i]; |
| 451 | |
|
2498
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
452 while (i < sc->source->len) { |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
453 |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
454 if (sc->source->data[i] == '$') { |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
455 break; |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
456 } |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
457 |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
458 if (sc->source->data[i] == '?') { |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
459 |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
460 sc->args = 1; |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
461 |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
462 if (sc->compile_args) { |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
463 break; |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
464 } |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
465 } |
|
d3357bf23a5e
fix /?new=arg?old=arg redirect case
Igor Sysoev <igor@sysoev.ru>
parents:
2397
diff
changeset
|
466 |
| 509 | 467 i++; |
| 468 name.len++; | |
| 469 } | |
| 470 | |
| 471 sc->size += name.len; | |
| 472 | |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
473 if (ngx_http_script_add_copy_code(sc, &name, (i == sc->source->len)) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
474 != NGX_OK) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
475 { |
| 509 | 476 return NGX_ERROR; |
| 477 } | |
| 507 | 478 } |
| 479 | |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
480 return ngx_http_script_done(sc); |
| 509 | 481 |
| 482 invalid_variable: | |
| 483 | |
| 484 ngx_conf_log_error(NGX_LOG_EMERG, sc->cf, 0, "invalid variable name"); | |
| 485 | |
| 486 return NGX_ERROR; | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
487 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
488 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
489 |
| 623 | 490 u_char * |
| 491 ngx_http_script_run(ngx_http_request_t *r, ngx_str_t *value, | |
| 492 void *code_lengths, size_t len, void *code_values) | |
| 493 { | |
|
1152
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
494 ngx_uint_t i; |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
495 ngx_http_script_code_pt code; |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
496 ngx_http_script_len_code_pt lcode; |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
497 ngx_http_script_engine_t e; |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
498 ngx_http_core_main_conf_t *cmcf; |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
499 |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
500 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
501 |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
502 for (i = 0; i < cmcf->variables.nelts; i++) { |
| 1565 | 503 if (r->variables[i].no_cacheable) { |
|
1152
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
504 r->variables[i].valid = 0; |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
505 r->variables[i].not_found = 0; |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
506 } |
|
a9715f8f17a5
flush nocachable variables before ngx_http_script_run()
Igor Sysoev <igor@sysoev.ru>
parents:
845
diff
changeset
|
507 } |
| 623 | 508 |
| 509 ngx_memzero(&e, sizeof(ngx_http_script_engine_t)); | |
| 510 | |
| 511 e.ip = code_lengths; | |
| 512 e.request = r; | |
| 513 e.flushed = 1; | |
| 514 | |
| 515 while (*(uintptr_t *) e.ip) { | |
| 516 lcode = *(ngx_http_script_len_code_pt *) e.ip; | |
| 517 len += lcode(&e); | |
| 518 } | |
| 519 | |
| 520 | |
| 521 value->len = len; | |
| 2049 | 522 value->data = ngx_pnalloc(r->pool, len); |
| 623 | 523 if (value->data == NULL) { |
| 524 return NULL; | |
| 525 } | |
| 526 | |
| 527 e.ip = code_values; | |
| 528 e.pos = value->data; | |
| 529 | |
| 530 while (*(uintptr_t *) e.ip) { | |
| 531 code = *(ngx_http_script_code_pt *) e.ip; | |
| 532 code((ngx_http_script_engine_t *) &e); | |
| 533 } | |
| 534 | |
| 535 return e.pos; | |
| 536 } | |
| 537 | |
| 538 | |
| 573 | 539 void |
| 1565 | 540 ngx_http_script_flush_no_cacheable_variables(ngx_http_request_t *r, |
| 573 | 541 ngx_array_t *indices) |
| 542 { | |
| 543 ngx_uint_t n, *index; | |
| 544 | |
| 545 if (indices) { | |
| 546 index = indices->elts; | |
| 547 for (n = 0; n < indices->nelts; n++) { | |
| 1565 | 548 if (r->variables[index[n]].no_cacheable) { |
| 573 | 549 r->variables[index[n]].valid = 0; |
| 550 r->variables[index[n]].not_found = 0; | |
| 551 } | |
| 552 } | |
| 553 } | |
| 554 } | |
| 555 | |
| 556 | |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
557 static ngx_int_t |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
558 ngx_http_script_init_arrays(ngx_http_script_compile_t *sc) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
559 { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
560 ngx_uint_t n; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
561 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
562 if (sc->flushes && *sc->flushes == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
563 n = sc->variables ? sc->variables : 1; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
564 *sc->flushes = ngx_array_create(sc->cf->pool, n, sizeof(ngx_uint_t)); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
565 if (*sc->flushes == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
566 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
567 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
568 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
569 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
570 if (*sc->lengths == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
571 n = sc->variables * (2 * sizeof(ngx_http_script_copy_code_t) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
572 + sizeof(ngx_http_script_var_code_t)) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
573 + sizeof(uintptr_t); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
574 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
575 *sc->lengths = ngx_array_create(sc->cf->pool, n, 1); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
576 if (*sc->lengths == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
577 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
578 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
579 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
580 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
581 if (*sc->values == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
582 n = (sc->variables * (2 * sizeof(ngx_http_script_copy_code_t) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
583 + sizeof(ngx_http_script_var_code_t)) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
584 + sizeof(uintptr_t) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
585 + sc->source->len |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
586 + sizeof(uintptr_t) - 1) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
587 & ~(sizeof(uintptr_t) - 1); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
588 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
589 *sc->values = ngx_array_create(sc->cf->pool, n, 1); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
590 if (*sc->values == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
591 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
592 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
593 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
594 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
595 sc->variables = 0; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
596 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
597 return NGX_OK; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
598 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
599 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
600 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
601 static ngx_int_t |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
602 ngx_http_script_done(ngx_http_script_compile_t *sc) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
603 { |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
604 ngx_str_t zero; |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
605 uintptr_t *code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
606 |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
607 if (sc->zero) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
608 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
609 zero.len = 1; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
610 zero.data = (u_char *) "\0"; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
611 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
612 if (ngx_http_script_add_copy_code(sc, &zero, 0) != NGX_OK) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
613 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
614 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
615 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
616 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
617 if (sc->conf_prefix || sc->root_prefix) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
618 if (ngx_http_script_add_full_name_code(sc) != NGX_OK) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
619 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
620 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
621 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
622 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
623 if (sc->complete_lengths) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
624 code = ngx_http_script_add_code(*sc->lengths, sizeof(uintptr_t), NULL); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
625 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
626 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
627 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
628 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
629 *code = (uintptr_t) NULL; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
630 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
631 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
632 if (sc->complete_values) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
633 code = ngx_http_script_add_code(*sc->values, sizeof(uintptr_t), |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
634 &sc->main); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
635 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
636 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
637 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
638 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
639 *code = (uintptr_t) NULL; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
640 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
641 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
642 return NGX_OK; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
643 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
644 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
645 |
| 509 | 646 void * |
| 507 | 647 ngx_http_script_start_code(ngx_pool_t *pool, ngx_array_t **codes, size_t size) |
| 479 | 648 { |
| 507 | 649 if (*codes == NULL) { |
| 650 *codes = ngx_array_create(pool, 256, 1); | |
| 651 if (*codes == NULL) { | |
| 652 return NULL; | |
| 653 } | |
| 654 } | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
655 |
| 507 | 656 return ngx_array_push_n(*codes, size); |
| 657 } | |
| 658 | |
| 509 | 659 |
| 660 void * | |
| 661 ngx_http_script_add_code(ngx_array_t *codes, size_t size, void *code) | |
| 662 { | |
| 663 u_char *elts, **p; | |
| 664 void *new; | |
| 665 | |
| 666 elts = codes->elts; | |
| 667 | |
| 668 new = ngx_array_push_n(codes, size); | |
| 669 if (new == NULL) { | |
| 2911 | 670 return NULL; |
| 509 | 671 } |
| 672 | |
| 673 if (code) { | |
| 674 if (elts != codes->elts) { | |
| 675 p = code; | |
| 676 *p += (u_char *) codes->elts - elts; | |
| 677 } | |
| 678 } | |
| 679 | |
| 680 return new; | |
| 681 } | |
| 507 | 682 |
| 479 | 683 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
684 static ngx_int_t |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
685 ngx_http_script_add_copy_code(ngx_http_script_compile_t *sc, ngx_str_t *value, |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
686 ngx_uint_t last) |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
687 { |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
688 u_char *p; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
689 size_t size, len, zero; |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
690 ngx_http_script_copy_code_t *code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
691 |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
692 zero = (sc->zero && last); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
693 len = value->len + zero; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
694 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
695 code = ngx_http_script_add_code(*sc->lengths, |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
696 sizeof(ngx_http_script_copy_code_t), NULL); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
697 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
698 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
699 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
700 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
701 code->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
702 code->len = len; |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
703 |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
704 size = (sizeof(ngx_http_script_copy_code_t) + len + sizeof(uintptr_t) - 1) |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
705 & ~(sizeof(uintptr_t) - 1); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
706 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
707 code = ngx_http_script_add_code(*sc->values, size, &sc->main); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
708 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
709 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
710 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
711 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
712 code->code = ngx_http_script_copy_code; |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
713 code->len = len; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
714 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
715 p = ngx_cpymem((u_char *) code + sizeof(ngx_http_script_copy_code_t), |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
716 value->data, value->len); |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
717 |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
718 if (zero) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
719 *p = '\0'; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
720 sc->zero = 0; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
721 } |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
722 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
723 return NGX_OK; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
724 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
725 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
726 |
| 507 | 727 size_t |
| 509 | 728 ngx_http_script_copy_len_code(ngx_http_script_engine_t *e) |
| 507 | 729 { |
| 730 ngx_http_script_copy_code_t *code; | |
| 479 | 731 |
| 509 | 732 code = (ngx_http_script_copy_code_t *) e->ip; |
| 507 | 733 |
| 509 | 734 e->ip += sizeof(ngx_http_script_copy_code_t); |
| 507 | 735 |
| 736 return code->len; | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
737 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
738 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
739 |
| 507 | 740 void |
| 509 | 741 ngx_http_script_copy_code(ngx_http_script_engine_t *e) |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
742 { |
| 2393 | 743 u_char *p; |
| 507 | 744 ngx_http_script_copy_code_t *code; |
| 745 | |
| 509 | 746 code = (ngx_http_script_copy_code_t *) e->ip; |
| 747 | |
| 2393 | 748 p = e->pos; |
| 749 | |
| 509 | 750 if (!e->skip) { |
| 2393 | 751 e->pos = ngx_copy(p, e->ip + sizeof(ngx_http_script_copy_code_t), |
| 573 | 752 code->len); |
| 509 | 753 } |
| 507 | 754 |
| 509 | 755 e->ip += sizeof(ngx_http_script_copy_code_t) |
| 756 + ((code->len + sizeof(uintptr_t) - 1) & ~(sizeof(uintptr_t) - 1)); | |
| 507 | 757 |
| 2393 | 758 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, |
| 759 "http script copy: \"%*s\"", e->pos - p, p); | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
760 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
761 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
762 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
763 static ngx_int_t |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
764 ngx_http_script_add_var_code(ngx_http_script_compile_t *sc, ngx_str_t *name) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
765 { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
766 ngx_int_t index, *p; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
767 ngx_http_script_var_code_t *code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
768 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
769 index = ngx_http_get_variable_index(sc->cf, name); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
770 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
771 if (index == NGX_ERROR) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
772 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
773 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
774 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
775 if (sc->flushes) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
776 p = ngx_array_push(*sc->flushes); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
777 if (p == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
778 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
779 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
780 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
781 *p = index; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
782 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
783 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
784 code = ngx_http_script_add_code(*sc->lengths, |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
785 sizeof(ngx_http_script_var_code_t), NULL); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
786 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
787 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
788 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
789 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
790 code->code = (ngx_http_script_code_pt) ngx_http_script_copy_var_len_code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
791 code->index = (uintptr_t) index; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
792 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
793 code = ngx_http_script_add_code(*sc->values, |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
794 sizeof(ngx_http_script_var_code_t), |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
795 &sc->main); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
796 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
797 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
798 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
799 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
800 code->code = ngx_http_script_copy_var_code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
801 code->index = (uintptr_t) index; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
802 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
803 return NGX_OK; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
804 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
805 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
806 |
| 507 | 807 size_t |
| 509 | 808 ngx_http_script_copy_var_len_code(ngx_http_script_engine_t *e) |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
809 { |
| 507 | 810 ngx_http_variable_value_t *value; |
| 811 ngx_http_script_var_code_t *code; | |
| 812 | |
| 509 | 813 code = (ngx_http_script_var_code_t *) e->ip; |
| 507 | 814 |
| 509 | 815 e->ip += sizeof(ngx_http_script_var_code_t); |
| 507 | 816 |
| 573 | 817 if (e->flushed) { |
| 818 value = ngx_http_get_indexed_variable(e->request, code->index); | |
| 507 | 819 |
| 573 | 820 } else { |
| 821 value = ngx_http_get_flushed_variable(e->request, code->index); | |
| 822 } | |
| 823 | |
| 824 if (value && !value->not_found) { | |
| 825 return value->len; | |
| 507 | 826 } |
| 827 | |
| 553 | 828 return 0; |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
829 } |
| 479 | 830 |
| 831 | |
| 507 | 832 void |
| 509 | 833 ngx_http_script_copy_var_code(ngx_http_script_engine_t *e) |
| 479 | 834 { |
| 2393 | 835 u_char *p; |
| 507 | 836 ngx_http_variable_value_t *value; |
| 837 ngx_http_script_var_code_t *code; | |
| 838 | |
| 509 | 839 code = (ngx_http_script_var_code_t *) e->ip; |
| 840 | |
| 841 e->ip += sizeof(ngx_http_script_var_code_t); | |
| 842 | |
| 843 if (!e->skip) { | |
| 573 | 844 |
| 845 if (e->flushed) { | |
| 846 value = ngx_http_get_indexed_variable(e->request, code->index); | |
| 509 | 847 |
| 573 | 848 } else { |
| 849 value = ngx_http_get_flushed_variable(e->request, code->index); | |
| 850 } | |
| 851 | |
| 852 if (value && !value->not_found) { | |
| 2393 | 853 p = e->pos; |
| 854 e->pos = ngx_copy(p, value->data, value->len); | |
| 509 | 855 |
| 2393 | 856 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, |
|
845
eb5cf273e5d2
debug log should not be under rewrite_log control
Igor Sysoev <igor@sysoev.ru>
parents:
730
diff
changeset
|
857 e->request->connection->log, 0, |
| 2393 | 858 "http script var: \"%*s\"", e->pos - p, p); |
| 509 | 859 } |
| 860 } | |
| 861 } | |
| 862 | |
| 863 | |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
864 static ngx_int_t |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
865 ngx_http_script_add_args_code(ngx_http_script_compile_t *sc) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
866 { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
867 uintptr_t *code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
868 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
869 code = ngx_http_script_add_code(*sc->lengths, sizeof(uintptr_t), NULL); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
870 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
871 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
872 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
873 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
874 *code = (uintptr_t) ngx_http_script_mark_args_code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
875 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
876 code = ngx_http_script_add_code(*sc->values, sizeof(uintptr_t), &sc->main); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
877 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
878 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
879 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
880 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
881 *code = (uintptr_t) ngx_http_script_start_args_code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
882 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
883 return NGX_OK; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
884 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
885 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
886 |
| 509 | 887 size_t |
|
1891
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
888 ngx_http_script_mark_args_code(ngx_http_script_engine_t *e) |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
889 { |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
890 e->is_args = 1; |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
891 e->ip += sizeof(uintptr_t); |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
892 |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
893 return 1; |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
894 } |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
895 |
|
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
896 |
| 509 | 897 void |
| 898 ngx_http_script_start_args_code(ngx_http_script_engine_t *e) | |
| 899 { | |
| 900 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 901 "http script args"); | |
| 577 | 902 |
|
2225
207827f7bf71
escape a query string characters taken from URI while rewrite
Igor Sysoev <igor@sysoev.ru>
parents:
2133
diff
changeset
|
903 e->is_args = 1; |
| 509 | 904 e->args = e->pos; |
| 905 e->ip += sizeof(uintptr_t); | |
| 906 } | |
| 907 | |
| 908 | |
| 517 | 909 #if (NGX_PCRE) |
| 910 | |
| 509 | 911 void |
| 912 ngx_http_script_regex_start_code(ngx_http_script_engine_t *e) | |
| 913 { | |
| 914 size_t len; | |
| 915 ngx_int_t rc; | |
| 916 ngx_uint_t n; | |
| 917 ngx_http_request_t *r; | |
| 918 ngx_http_script_engine_t le; | |
| 919 ngx_http_script_len_code_pt lcode; | |
| 920 ngx_http_script_regex_code_t *code; | |
| 921 | |
| 922 code = (ngx_http_script_regex_code_t *) e->ip; | |
| 923 | |
| 924 r = e->request; | |
| 925 | |
| 926 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 927 "http script regex: \"%V\"", &code->name); | |
| 928 | |
| 929 if (code->uri) { | |
| 515 | 930 e->line = r->uri; |
| 509 | 931 } else { |
| 932 e->sp--; | |
| 573 | 933 e->line.len = e->sp->len; |
| 934 e->line.data = e->sp->data; | |
| 509 | 935 } |
| 507 | 936 |
| 3325 | 937 rc = ngx_http_regex_exec(r, code->regex, &e->line); |
|
2547
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
938 |
| 3325 | 939 if (rc == NGX_DECLINED) { |
| 2397 | 940 if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) { |
| 509 | 941 ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, |
| 515 | 942 "\"%V\" does not match \"%V\"", |
| 943 &code->name, &e->line); | |
| 509 | 944 } |
| 945 | |
|
2547
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
946 r->ncaptures = 0; |
| 515 | 947 |
| 509 | 948 if (code->test) { |
| 631 | 949 if (code->negative_test) { |
| 950 e->sp->len = 1; | |
| 951 e->sp->data = (u_char *) "1"; | |
| 952 | |
| 953 } else { | |
| 954 e->sp->len = 0; | |
| 955 e->sp->data = (u_char *) ""; | |
| 956 } | |
| 957 | |
| 509 | 958 e->sp++; |
| 959 | |
| 960 e->ip += sizeof(ngx_http_script_regex_code_t); | |
| 961 return; | |
| 962 } | |
| 963 | |
| 964 e->ip += code->next; | |
| 965 return; | |
| 966 } | |
| 967 | |
| 3325 | 968 if (rc == NGX_ERROR) { |
| 509 | 969 e->ip = ngx_http_script_exit; |
| 970 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 971 return; | |
| 972 } | |
| 973 | |
| 2397 | 974 if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) { |
| 509 | 975 ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, |
| 515 | 976 "\"%V\" matches \"%V\"", &code->name, &e->line); |
| 509 | 977 } |
| 978 | |
| 979 if (code->test) { | |
| 631 | 980 if (code->negative_test) { |
| 981 e->sp->len = 0; | |
| 982 e->sp->data = (u_char *) ""; | |
| 983 | |
| 984 } else { | |
| 985 e->sp->len = 1; | |
| 986 e->sp->data = (u_char *) "1"; | |
| 987 } | |
| 988 | |
| 509 | 989 e->sp++; |
| 990 | |
| 991 e->ip += sizeof(ngx_http_script_regex_code_t); | |
| 992 return; | |
| 993 } | |
| 994 | |
| 995 if (code->status) { | |
| 996 e->status = code->status; | |
| 507 | 997 |
| 509 | 998 if (!code->redirect) { |
| 999 e->ip = ngx_http_script_exit; | |
| 1000 return; | |
| 1001 } | |
| 1002 } | |
| 1003 | |
| 1004 if (code->uri) { | |
| 1005 r->internal = 1; | |
| 1006 r->valid_unparsed_uri = 0; | |
| 1007 | |
| 1008 if (code->break_cycle) { | |
| 1009 r->valid_location = 0; | |
| 527 | 1010 r->uri_changed = 0; |
| 509 | 1011 |
| 1012 } else { | |
| 1013 r->uri_changed = 1; | |
| 1014 } | |
| 1015 } | |
| 1016 | |
| 1017 if (code->lengths == NULL) { | |
| 1018 e->buf.len = code->size; | |
| 1019 | |
| 1020 if (code->uri) { | |
|
3344
1aed55182ea2
fix captures in "rewrite", the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
1021 if (r->ncaptures && (r->quoted_uri || r->plus_in_uri)) { |
| 509 | 1022 e->buf.len += 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len, |
| 1023 NGX_ESCAPE_ARGS); | |
| 1024 } | |
| 1025 } | |
| 1026 | |
|
3344
1aed55182ea2
fix captures in "rewrite", the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
1027 for (n = 2; n < r->ncaptures; n += 2) { |
|
1aed55182ea2
fix captures in "rewrite", the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
1028 e->buf.len += r->captures[n + 1] - r->captures[n]; |
| 509 | 1029 } |
| 1030 | |
| 1031 } else { | |
| 1032 ngx_memzero(&le, sizeof(ngx_http_script_engine_t)); | |
| 1033 | |
| 1034 le.ip = code->lengths->elts; | |
| 679 | 1035 le.line = e->line; |
| 509 | 1036 le.request = r; |
| 679 | 1037 le.quote = code->redirect; |
| 509 | 1038 |
|
1891
782af1038115
length calculation did not take into account escaped symbols in arguments
Igor Sysoev <igor@sysoev.ru>
parents:
1799
diff
changeset
|
1039 len = 0; |
| 509 | 1040 |
| 1041 while (*(uintptr_t *) le.ip) { | |
| 1042 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 1043 len += lcode(&le); | |
| 1044 } | |
| 1045 | |
| 1046 e->buf.len = len; | |
| 1047 } | |
| 1048 | |
| 515 | 1049 if (code->add_args && r->args.len) { |
| 509 | 1050 e->buf.len += r->args.len + 1; |
| 1051 } | |
| 1052 | |
| 2049 | 1053 e->buf.data = ngx_pnalloc(r->pool, e->buf.len); |
| 509 | 1054 if (e->buf.data == NULL) { |
| 1055 e->ip = ngx_http_script_exit; | |
| 1056 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 507 | 1057 return; |
| 1058 } | |
| 1059 | |
| 509 | 1060 e->quote = code->redirect; |
| 1061 | |
| 1062 e->pos = e->buf.data; | |
| 1063 | |
| 1064 e->ip += sizeof(ngx_http_script_regex_code_t); | |
| 1065 } | |
| 1066 | |
| 1067 | |
| 1068 void | |
| 1069 ngx_http_script_regex_end_code(ngx_http_script_engine_t *e) | |
| 1070 { | |
| 577 | 1071 u_char *dst, *src; |
| 509 | 1072 ngx_http_request_t *r; |
| 1073 ngx_http_script_regex_end_code_t *code; | |
| 1074 | |
| 1075 code = (ngx_http_script_regex_end_code_t *) e->ip; | |
| 1076 | |
| 1077 r = e->request; | |
| 1078 | |
| 1079 e->quote = 0; | |
| 1080 | |
| 1081 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1082 "http script regex end"); | |
| 1083 | |
| 1084 if (code->redirect) { | |
| 1085 | |
| 577 | 1086 dst = e->buf.data; |
| 1087 src = e->buf.data; | |
| 1088 | |
| 1593 | 1089 ngx_unescape_uri(&dst, &src, e->pos - e->buf.data, |
| 1090 NGX_UNESCAPE_REDIRECT); | |
| 577 | 1091 |
| 1092 if (src < e->pos) { | |
|
3887
e7798b5e990a
use memmove() in appropriate places
Igor Sysoev <igor@sysoev.ru>
parents:
3761
diff
changeset
|
1093 dst = ngx_movemem(dst, src, e->pos - src); |
| 577 | 1094 } |
| 1095 | |
| 1096 e->pos = dst; | |
| 1097 | |
| 1098 if (code->add_args && r->args.len) { | |
| 509 | 1099 *e->pos++ = (u_char) (code->args ? '&' : '?'); |
| 573 | 1100 e->pos = ngx_copy(e->pos, r->args.data, r->args.len); |
| 509 | 1101 } |
| 1102 | |
| 1103 e->buf.len = e->pos - e->buf.data; | |
| 1104 | |
| 2397 | 1105 if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) { |
| 509 | 1106 ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, |
| 1107 "rewritten redirect: \"%V\"", &e->buf); | |
| 1108 } | |
| 1109 | |
|
4206
1a94a56a4e5d
Clear old Location header (if any) while adding a new one.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3904
diff
changeset
|
1110 ngx_http_clear_location(r); |
|
1a94a56a4e5d
Clear old Location header (if any) while adding a new one.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3904
diff
changeset
|
1111 |
| 509 | 1112 r->headers_out.location = ngx_list_push(&r->headers_out.headers); |
| 1113 if (r->headers_out.location == NULL) { | |
| 1114 e->ip = ngx_http_script_exit; | |
| 1115 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 1116 return; | |
| 1117 } | |
| 1118 | |
| 577 | 1119 r->headers_out.location->hash = 1; |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3344
diff
changeset
|
1120 ngx_str_set(&r->headers_out.location->key, "Location"); |
| 509 | 1121 r->headers_out.location->value = e->buf; |
| 1122 | |
| 1123 e->ip += sizeof(ngx_http_script_regex_end_code_t); | |
| 1124 return; | |
| 1125 } | |
| 1126 | |
| 577 | 1127 if (e->args) { |
| 509 | 1128 e->buf.len = e->args - e->buf.data; |
| 1129 | |
| 1130 if (code->add_args && r->args.len) { | |
| 1131 *e->pos++ = '&'; | |
| 573 | 1132 e->pos = ngx_copy(e->pos, r->args.data, r->args.len); |
| 509 | 1133 } |
| 1134 | |
| 1135 r->args.len = e->pos - e->args; | |
| 1136 r->args.data = e->args; | |
| 1137 | |
| 1138 e->args = NULL; | |
| 1139 | |
| 1140 } else { | |
| 1141 e->buf.len = e->pos - e->buf.data; | |
| 673 | 1142 |
| 1143 if (!code->add_args) { | |
| 1144 r->args.len = 0; | |
| 1145 } | |
| 509 | 1146 } |
| 1147 | |
| 2397 | 1148 if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) { |
| 509 | 1149 ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, |
| 1150 "rewritten data: \"%V\", args: \"%V\"", | |
| 1151 &e->buf, &r->args); | |
| 1152 } | |
| 1153 | |
| 1154 if (code->uri) { | |
| 1155 r->uri = e->buf; | |
| 1156 | |
| 535 | 1157 if (r->uri.len == 0) { |
| 1158 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 1159 "the rewritten URI has a zero length"); | |
| 1160 e->ip = ngx_http_script_exit; | |
| 1161 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 1162 return; | |
| 1163 } | |
| 1164 | |
|
2979
b941147f2b2e
ngx_http_set_exten() is always successful since 0.3.46
Igor Sysoev <igor@sysoev.ru>
parents:
2911
diff
changeset
|
1165 ngx_http_set_exten(r); |
| 509 | 1166 } |
| 1167 | |
| 1168 e->ip += sizeof(ngx_http_script_regex_end_code_t); | |
| 1169 } | |
| 1170 | |
|
2547
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1171 |
|
2577
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1172 static ngx_int_t |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1173 ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc, ngx_uint_t n) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1174 { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1175 ngx_http_script_copy_capture_code_t *code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1176 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1177 code = ngx_http_script_add_code(*sc->lengths, |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1178 sizeof(ngx_http_script_copy_capture_code_t), |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1179 NULL); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1180 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1181 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1182 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1183 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1184 code->code = (ngx_http_script_code_pt) |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1185 ngx_http_script_copy_capture_len_code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1186 code->n = 2 * n; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1187 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1188 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1189 code = ngx_http_script_add_code(*sc->values, |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1190 sizeof(ngx_http_script_copy_capture_code_t), |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1191 &sc->main); |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1192 if (code == NULL) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1193 return NGX_ERROR; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1194 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1195 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1196 code->code = ngx_http_script_copy_capture_code; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1197 code->n = 2 * n; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1198 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1199 if (sc->ncaptures < n) { |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1200 sc->ncaptures = n; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1201 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1202 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1203 return NGX_OK; |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1204 } |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1205 |
|
2dcbcfc1a8d1
split ngx_http_script_compile()
Igor Sysoev <igor@sysoev.ru>
parents:
2547
diff
changeset
|
1206 |
|
2547
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1207 size_t |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1208 ngx_http_script_copy_capture_len_code(ngx_http_script_engine_t *e) |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1209 { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1210 int *cap; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1211 u_char *p; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1212 ngx_uint_t n; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1213 ngx_http_request_t *r; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1214 ngx_http_script_copy_capture_code_t *code; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1215 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1216 r = e->request; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1217 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1218 code = (ngx_http_script_copy_capture_code_t *) e->ip; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1219 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1220 e->ip += sizeof(ngx_http_script_copy_capture_code_t); |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1221 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1222 n = code->n; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1223 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1224 if (n < r->ncaptures) { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1225 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1226 cap = r->captures; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1227 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1228 if ((e->is_args || e->quote) |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1229 && (e->request->quoted_uri || e->request->plus_in_uri)) |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1230 { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1231 p = r->captures_data; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1232 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1233 return cap[n + 1] - cap[n] |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1234 + 2 * ngx_escape_uri(NULL, &p[cap[n]], cap[n + 1] - cap[n], |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1235 NGX_ESCAPE_ARGS); |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1236 } else { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1237 return cap[n + 1] - cap[n]; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1238 } |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1239 } |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1240 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1241 return 0; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1242 } |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1243 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1244 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1245 void |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1246 ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e) |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1247 { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1248 int *cap; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1249 u_char *p, *pos; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1250 ngx_uint_t n; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1251 ngx_http_request_t *r; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1252 ngx_http_script_copy_capture_code_t *code; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1253 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1254 r = e->request; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1255 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1256 code = (ngx_http_script_copy_capture_code_t *) e->ip; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1257 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1258 e->ip += sizeof(ngx_http_script_copy_capture_code_t); |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1259 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1260 n = code->n; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1261 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1262 pos = e->pos; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1263 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1264 if (n < r->ncaptures) { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1265 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1266 cap = r->captures; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1267 p = r->captures_data; |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1268 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1269 if ((e->is_args || e->quote) |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1270 && (e->request->quoted_uri || e->request->plus_in_uri)) |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1271 { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1272 e->pos = (u_char *) ngx_escape_uri(pos, &p[cap[n]], |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1273 cap[n + 1] - cap[n], |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1274 NGX_ESCAPE_ARGS); |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1275 } else { |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1276 e->pos = ngx_copy(pos, &p[cap[n]], cap[n + 1] - cap[n]); |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1277 } |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1278 } |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1279 |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1280 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1281 "http script capture: \"%*s\"", e->pos - pos, pos); |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1282 } |
|
912ce4113f21
now regex captures are per-request entities
Igor Sysoev <igor@sysoev.ru>
parents:
2498
diff
changeset
|
1283 |
| 517 | 1284 #endif |
| 1285 | |
| 509 | 1286 |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1287 static ngx_int_t |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1288 ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1289 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1290 ngx_http_script_full_name_code_t *code; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1291 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1292 code = ngx_http_script_add_code(*sc->lengths, |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1293 sizeof(ngx_http_script_full_name_code_t), |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1294 NULL); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1295 if (code == NULL) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1296 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1297 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1298 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1299 code->code = (ngx_http_script_code_pt) ngx_http_script_full_name_len_code; |
| 2758 | 1300 code->conf_prefix = sc->conf_prefix; |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1301 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1302 code = ngx_http_script_add_code(*sc->values, |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1303 sizeof(ngx_http_script_full_name_code_t), |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1304 &sc->main); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1305 if (code == NULL) { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1306 return NGX_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1307 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1308 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1309 code->code = ngx_http_script_full_name_code; |
| 2758 | 1310 code->conf_prefix = sc->conf_prefix; |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1311 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1312 return NGX_OK; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1313 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1314 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1315 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1316 static size_t |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1317 ngx_http_script_full_name_len_code(ngx_http_script_engine_t *e) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1318 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1319 ngx_http_script_full_name_code_t *code; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1320 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1321 code = (ngx_http_script_full_name_code_t *) e->ip; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1322 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1323 e->ip += sizeof(ngx_http_script_full_name_code_t); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1324 |
| 2758 | 1325 return code->conf_prefix ? ngx_cycle->conf_prefix.len: |
| 1326 ngx_cycle->prefix.len; | |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1327 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1328 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1329 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1330 static void |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1331 ngx_http_script_full_name_code(ngx_http_script_engine_t *e) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1332 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1333 ngx_http_script_full_name_code_t *code; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1334 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1335 ngx_str_t value; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1336 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1337 code = (ngx_http_script_full_name_code_t *) e->ip; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1338 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1339 value.data = e->buf.data; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1340 value.len = e->pos - e->buf.data; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1341 |
|
5316
12dd27b74117
Fixed memory leaks in the root and auth_basic_user_file directives.
Valentin Bartenev <vbart@nginx.com>
parents:
4947
diff
changeset
|
1342 if (ngx_get_full_name(e->request->pool, |
|
12dd27b74117
Fixed memory leaks in the root and auth_basic_user_file directives.
Valentin Bartenev <vbart@nginx.com>
parents:
4947
diff
changeset
|
1343 code->conf_prefix |
|
12dd27b74117
Fixed memory leaks in the root and auth_basic_user_file directives.
Valentin Bartenev <vbart@nginx.com>
parents:
4947
diff
changeset
|
1344 ? (ngx_str_t *) &ngx_cycle->conf_prefix: |
|
12dd27b74117
Fixed memory leaks in the root and auth_basic_user_file directives.
Valentin Bartenev <vbart@nginx.com>
parents:
4947
diff
changeset
|
1345 (ngx_str_t *) &ngx_cycle->prefix, |
|
12dd27b74117
Fixed memory leaks in the root and auth_basic_user_file directives.
Valentin Bartenev <vbart@nginx.com>
parents:
4947
diff
changeset
|
1346 &value) |
|
2587
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1347 != NGX_OK) |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1348 { |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1349 e->ip = ngx_http_script_exit; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1350 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1351 return; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1352 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1353 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1354 e->buf = value; |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1355 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1356 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1357 "http script fullname: \"%V\"", &value); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1358 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1359 e->ip += sizeof(ngx_http_script_full_name_code_t); |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1360 } |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1361 |
|
8afc4df77ee8
ngx_http_script_flush_complex_value()
Igor Sysoev <igor@sysoev.ru>
parents:
2577
diff
changeset
|
1362 |
| 509 | 1363 void |
| 1364 ngx_http_script_return_code(ngx_http_script_engine_t *e) | |
| 577 | 1365 { |
| 509 | 1366 ngx_http_script_return_code_t *code; |
| 577 | 1367 |
| 509 | 1368 code = (ngx_http_script_return_code_t *) e->ip; |
| 1369 | |
| 3633 | 1370 if (code->status < NGX_HTTP_BAD_REQUEST |
| 1371 || code->text.value.len | |
| 1372 || code->text.lengths) | |
| 1373 { | |
| 1374 e->status = ngx_http_send_response(e->request, code->status, NULL, | |
| 1375 &code->text); | |
| 1376 } else { | |
| 1377 e->status = code->status; | |
| 653 | 1378 } |
| 1379 | |
| 3633 | 1380 e->ip = ngx_http_script_exit; |
| 479 | 1381 } |
| 509 | 1382 |
| 1383 | |
| 1384 void | |
| 527 | 1385 ngx_http_script_break_code(ngx_http_script_engine_t *e) |
| 1386 { | |
| 1387 e->request->uri_changed = 0; | |
| 1388 | |
| 1389 e->ip = ngx_http_script_exit; | |
| 1390 } | |
| 1391 | |
| 1392 | |
| 1393 void | |
| 509 | 1394 ngx_http_script_if_code(ngx_http_script_engine_t *e) |
| 1395 { | |
| 1396 ngx_http_script_if_code_t *code; | |
| 1397 | |
| 1398 code = (ngx_http_script_if_code_t *) e->ip; | |
| 1399 | |
| 1400 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1401 "http script if"); | |
| 1402 | |
| 1403 e->sp--; | |
| 1404 | |
|
3904
77f667dd0504
test zero value in an "if" directive consistently with predicates fixed in r3894
Igor Sysoev <igor@sysoev.ru>
parents:
3893
diff
changeset
|
1405 if (e->sp->len && (e->sp->len !=1 || e->sp->data[0] != '0')) { |
| 509 | 1406 if (code->loc_conf) { |
| 1407 e->request->loc_conf = code->loc_conf; | |
| 535 | 1408 ngx_http_update_location_config(e->request); |
| 509 | 1409 } |
| 1410 | |
| 1411 e->ip += sizeof(ngx_http_script_if_code_t); | |
| 1412 return; | |
| 1413 } | |
| 1414 | |
| 1415 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 577 | 1416 "http script if: false"); |
| 509 | 1417 |
| 1418 e->ip += code->next; | |
| 1419 } | |
| 1420 | |
| 1421 | |
| 1422 void | |
| 577 | 1423 ngx_http_script_equal_code(ngx_http_script_engine_t *e) |
| 1424 { | |
| 1425 ngx_http_variable_value_t *val, *res; | |
| 1426 | |
| 1427 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1428 "http script equal"); | |
| 1429 | |
| 1430 e->sp--; | |
| 1431 val = e->sp; | |
| 1432 res = e->sp - 1; | |
| 1433 | |
| 1434 e->ip += sizeof(uintptr_t); | |
| 1435 | |
| 2393 | 1436 if (val->len == res->len |
| 1437 && ngx_strncmp(val->data, res->data, res->len) == 0) | |
| 577 | 1438 { |
| 1439 *res = ngx_http_variable_true_value; | |
| 1440 return; | |
| 1441 } | |
| 1442 | |
| 1443 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1444 "http script equal: no"); | |
| 1445 | |
| 1446 *res = ngx_http_variable_null_value; | |
| 1447 } | |
| 1448 | |
| 1449 | |
| 1450 void | |
| 1451 ngx_http_script_not_equal_code(ngx_http_script_engine_t *e) | |
| 1452 { | |
| 1453 ngx_http_variable_value_t *val, *res; | |
| 1454 | |
| 1455 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1456 "http script not equal"); | |
| 1457 | |
| 1458 e->sp--; | |
| 1459 val = e->sp; | |
| 1460 res = e->sp - 1; | |
| 1461 | |
| 1462 e->ip += sizeof(uintptr_t); | |
| 1463 | |
| 2393 | 1464 if (val->len == res->len |
| 1465 && ngx_strncmp(val->data, res->data, res->len) == 0) | |
| 577 | 1466 { |
| 1467 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1468 "http script not equal: no"); | |
| 1469 | |
| 1470 *res = ngx_http_variable_null_value; | |
| 1471 return; | |
| 1472 } | |
| 1473 | |
| 1474 *res = ngx_http_variable_true_value; | |
| 1475 } | |
| 1476 | |
| 1477 | |
| 1478 void | |
| 631 | 1479 ngx_http_script_file_code(ngx_http_script_engine_t *e) |
| 1480 { | |
| 1454 | 1481 ngx_str_t path; |
| 1482 ngx_http_request_t *r; | |
| 1483 ngx_open_file_info_t of; | |
| 1484 ngx_http_core_loc_conf_t *clcf; | |
| 631 | 1485 ngx_http_variable_value_t *value; |
| 1486 ngx_http_script_file_code_t *code; | |
| 1487 | |
| 1488 value = e->sp - 1; | |
| 1489 | |
| 1490 code = (ngx_http_script_file_code_t *) e->ip; | |
| 1491 e->ip += sizeof(ngx_http_script_file_code_t); | |
| 1492 | |
| 1454 | 1493 path.len = value->len - 1; |
| 1494 path.data = value->data; | |
| 1495 | |
| 1496 r = e->request; | |
| 1497 | |
| 1498 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1499 "http script file op %p \"%V\"", code->op, &path); | |
| 1500 | |
| 1501 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | |
| 631 | 1502 |
|
2068
75a8d34459c5
ngx_memzero() ngx_open_file_info_t
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
1503 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); |
|
75a8d34459c5
ngx_memzero() ngx_open_file_info_t
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
1504 |
| 3178 | 1505 of.read_ahead = clcf->read_ahead; |
| 2129 | 1506 of.directio = clcf->directio; |
|
1767
c42431762903
open_file_cache_retest > open_file_cache_valid
Igor Sysoev <igor@sysoev.ru>
parents:
1593
diff
changeset
|
1507 of.valid = clcf->open_file_cache_valid; |
| 1772 | 1508 of.min_uses = clcf->open_file_cache_min_uses; |
|
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2609
diff
changeset
|
1509 of.test_only = 1; |
| 1454 | 1510 of.errors = clcf->open_file_cache_errors; |
| 1457 | 1511 of.events = clcf->open_file_cache_events; |
|
4494
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
1512 |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
1513 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
1514 e->ip = ngx_http_script_exit; |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
1515 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
1516 return; |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
1517 } |
| 631 | 1518 |
| 1454 | 1519 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) |
| 1799 | 1520 != NGX_OK) |
| 1454 | 1521 { |
|
3160
a7637c2c1157
low ENAMETOOLONG logging level
Igor Sysoev <igor@sysoev.ru>
parents:
2979
diff
changeset
|
1522 if (of.err != NGX_ENOENT |
|
a7637c2c1157
low ENAMETOOLONG logging level
Igor Sysoev <igor@sysoev.ru>
parents:
2979
diff
changeset
|
1523 && of.err != NGX_ENOTDIR |
|
a7637c2c1157
low ENAMETOOLONG logging level
Igor Sysoev <igor@sysoev.ru>
parents:
2979
diff
changeset
|
1524 && of.err != NGX_ENAMETOOLONG) |
|
a7637c2c1157
low ENAMETOOLONG logging level
Igor Sysoev <igor@sysoev.ru>
parents:
2979
diff
changeset
|
1525 { |
| 1454 | 1526 ngx_log_error(NGX_LOG_CRIT, r->connection->log, of.err, |
|
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2609
diff
changeset
|
1527 "%s \"%s\" failed", of.failed, value->data); |
| 631 | 1528 } |
| 1529 | |
| 1530 switch (code->op) { | |
| 671 | 1531 |
| 631 | 1532 case ngx_http_script_file_plain: |
| 669 | 1533 case ngx_http_script_file_dir: |
| 1534 case ngx_http_script_file_exists: | |
| 1535 case ngx_http_script_file_exec: | |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1536 goto false_value; |
| 671 | 1537 |
| 631 | 1538 case ngx_http_script_file_not_plain: |
| 669 | 1539 case ngx_http_script_file_not_dir: |
| 671 | 1540 case ngx_http_script_file_not_exists: |
| 669 | 1541 case ngx_http_script_file_not_exec: |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1542 goto true_value; |
| 631 | 1543 } |
| 1544 | |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1545 goto false_value; |
| 631 | 1546 } |
| 1547 | |
| 1548 switch (code->op) { | |
| 1549 case ngx_http_script_file_plain: | |
| 1454 | 1550 if (of.is_file) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1551 goto true_value; |
| 631 | 1552 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1553 goto false_value; |
| 631 | 1554 |
| 1555 case ngx_http_script_file_not_plain: | |
| 1454 | 1556 if (of.is_file) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1557 goto false_value; |
| 631 | 1558 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1559 goto true_value; |
| 669 | 1560 |
| 1561 case ngx_http_script_file_dir: | |
| 1454 | 1562 if (of.is_dir) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1563 goto true_value; |
| 669 | 1564 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1565 goto false_value; |
| 669 | 1566 |
| 1567 case ngx_http_script_file_not_dir: | |
| 1454 | 1568 if (of.is_dir) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1569 goto false_value; |
| 669 | 1570 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1571 goto true_value; |
| 669 | 1572 |
| 1573 case ngx_http_script_file_exists: | |
| 1454 | 1574 if (of.is_file || of.is_dir || of.is_link) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1575 goto true_value; |
| 669 | 1576 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1577 goto false_value; |
| 669 | 1578 |
| 1579 case ngx_http_script_file_not_exists: | |
| 1454 | 1580 if (of.is_file || of.is_dir || of.is_link) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1581 goto false_value; |
| 669 | 1582 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1583 goto true_value; |
| 669 | 1584 |
| 1585 case ngx_http_script_file_exec: | |
| 1454 | 1586 if (of.is_exec) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1587 goto true_value; |
| 669 | 1588 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1589 goto false_value; |
| 669 | 1590 |
| 1591 case ngx_http_script_file_not_exec: | |
| 1454 | 1592 if (of.is_exec) { |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1593 goto false_value; |
| 669 | 1594 } |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1595 goto true_value; |
| 631 | 1596 } |
| 1597 | |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1598 false_value: |
| 631 | 1599 |
| 1454 | 1600 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 631 | 1601 "http script file op false"); |
| 1602 | |
| 1603 *value = ngx_http_variable_null_value; | |
| 1604 return; | |
| 1605 | |
|
2133
c505e2712e13
fix conflicting names "true" and "false"
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
1606 true_value: |
| 631 | 1607 |
| 1608 *value = ngx_http_variable_true_value; | |
| 1609 return; | |
| 1610 } | |
| 1611 | |
| 1612 | |
| 1613 void | |
| 515 | 1614 ngx_http_script_complex_value_code(ngx_http_script_engine_t *e) |
| 1615 { | |
| 1616 size_t len; | |
| 1617 ngx_http_script_engine_t le; | |
| 1618 ngx_http_script_len_code_pt lcode; | |
| 1619 ngx_http_script_complex_value_code_t *code; | |
| 1620 | |
| 1621 code = (ngx_http_script_complex_value_code_t *) e->ip; | |
| 1622 | |
| 1623 e->ip += sizeof(ngx_http_script_complex_value_code_t); | |
| 1624 | |
| 1625 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1626 "http script complex value"); | |
| 1627 | |
| 1628 ngx_memzero(&le, sizeof(ngx_http_script_engine_t)); | |
| 1629 | |
| 1630 le.ip = code->lengths->elts; | |
| 655 | 1631 le.line = e->line; |
| 515 | 1632 le.request = e->request; |
| 655 | 1633 le.quote = e->quote; |
| 515 | 1634 |
| 1635 for (len = 0; *(uintptr_t *) le.ip; len += lcode(&le)) { | |
| 1636 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 1637 } | |
| 1638 | |
| 1639 e->buf.len = len; | |
| 2049 | 1640 e->buf.data = ngx_pnalloc(e->request->pool, len); |
| 515 | 1641 if (e->buf.data == NULL) { |
| 1642 e->ip = ngx_http_script_exit; | |
| 1643 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 1644 return; | |
| 1645 } | |
| 1646 | |
| 1647 e->pos = e->buf.data; | |
| 1648 | |
| 577 | 1649 e->sp->len = e->buf.len; |
| 573 | 1650 e->sp->data = e->buf.data; |
| 515 | 1651 e->sp++; |
| 1652 } | |
| 1653 | |
| 1654 | |
| 1655 void | |
| 509 | 1656 ngx_http_script_value_code(ngx_http_script_engine_t *e) |
| 1657 { | |
| 1658 ngx_http_script_value_code_t *code; | |
| 1659 | |
| 1660 code = (ngx_http_script_value_code_t *) e->ip; | |
| 1661 | |
| 1662 e->ip += sizeof(ngx_http_script_value_code_t); | |
| 1663 | |
| 573 | 1664 e->sp->len = code->text_len; |
| 1665 e->sp->data = (u_char *) code->text_data; | |
| 577 | 1666 |
| 1667 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1561 | 1668 "http script value: \"%v\"", e->sp); |
| 577 | 1669 |
| 509 | 1670 e->sp++; |
| 1671 } | |
| 1672 | |
| 1673 | |
| 1674 void | |
| 1675 ngx_http_script_set_var_code(ngx_http_script_engine_t *e) | |
| 1676 { | |
| 1677 ngx_http_request_t *r; | |
| 1678 ngx_http_script_var_code_t *code; | |
| 1679 | |
| 1680 code = (ngx_http_script_var_code_t *) e->ip; | |
| 1681 | |
| 1682 e->ip += sizeof(ngx_http_script_var_code_t); | |
| 1683 | |
| 1684 r = e->request; | |
| 1685 | |
| 1686 e->sp--; | |
| 1687 | |
| 573 | 1688 r->variables[code->index].len = e->sp->len; |
| 1689 r->variables[code->index].valid = 1; | |
| 1565 | 1690 r->variables[code->index].no_cacheable = 0; |
| 573 | 1691 r->variables[code->index].not_found = 0; |
| 1692 r->variables[code->index].data = e->sp->data; | |
| 2393 | 1693 |
| 1694 #if (NGX_DEBUG) | |
| 1695 { | |
| 1696 ngx_http_variable_t *v; | |
| 1697 ngx_http_core_main_conf_t *cmcf; | |
| 1698 | |
| 1699 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); | |
| 1700 | |
| 1701 v = cmcf->variables.elts; | |
| 1702 | |
| 1703 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1704 "http script set $%V", &v[code->index].name); | |
| 1705 } | |
| 1706 #endif | |
| 509 | 1707 } |
| 1708 | |
| 1709 | |
| 1710 void | |
| 637 | 1711 ngx_http_script_var_set_handler_code(ngx_http_script_engine_t *e) |
| 1712 { | |
| 1713 ngx_http_script_var_handler_code_t *code; | |
| 1714 | |
| 1715 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1716 "http script set var handler"); | |
| 1717 | |
| 1718 code = (ngx_http_script_var_handler_code_t *) e->ip; | |
| 1719 | |
| 1720 e->ip += sizeof(ngx_http_script_var_handler_code_t); | |
| 1721 | |
| 1722 e->sp--; | |
| 1723 | |
| 1724 code->handler(e->request, e->sp, code->data); | |
| 1725 } | |
| 1726 | |
| 1727 | |
| 1728 void | |
| 509 | 1729 ngx_http_script_var_code(ngx_http_script_engine_t *e) |
| 1730 { | |
| 1731 ngx_http_variable_value_t *value; | |
| 1732 ngx_http_script_var_code_t *code; | |
| 1733 | |
| 1734 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
| 1735 "http script var"); | |
| 1736 | |
| 1737 code = (ngx_http_script_var_code_t *) e->ip; | |
| 1738 | |
| 1739 e->ip += sizeof(ngx_http_script_var_code_t); | |
| 1740 | |
| 573 | 1741 value = ngx_http_get_flushed_variable(e->request, code->index); |
| 509 | 1742 |
| 573 | 1743 if (value && !value->not_found) { |
| 1744 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0, | |
|
1406
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1152
diff
changeset
|
1745 "http script var: \"%v\"", value); |
| 573 | 1746 |
| 553 | 1747 *e->sp = *value; |
| 509 | 1748 e->sp++; |
| 1749 | |
| 1750 return; | |
| 1751 } | |
| 1752 | |
| 577 | 1753 *e->sp = ngx_http_variable_null_value; |
| 509 | 1754 e->sp++; |
| 1755 } | |
| 1756 | |
| 1757 | |
| 1758 void | |
| 1759 ngx_http_script_nop_code(ngx_http_script_engine_t *e) | |
| 1760 { | |
| 1761 e->ip += sizeof(uintptr_t); | |
| 1762 } |