Mercurial > hg > nginx
annotate src/http/modules/ngx_http_sub_filter_module.c @ 5710:9e9c1310d17c
Sub filter: fixed subrequests handling.
In particular, properly output partial match at the end of a subrequest
response (much like we do at the end of a response), and reset/set the
last_in_chain flag as appropriate.
Reported by KAWAHARA Masashi.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 27 May 2014 16:37:35 +0400 |
parents | 102d7117ffb8 |
children | e491b26fa5a1 |
rev | line source |
---|---|
1172 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
1172 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_http.h> | |
11 | |
12 | |
13 typedef struct { | |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
14 ngx_str_t match; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
15 ngx_http_complex_value_t value; |
1172 | 16 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
17 ngx_hash_t types; |
1172 | 18 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
19 ngx_flag_t once; |
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
20 ngx_flag_t last_modified; |
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
21 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
22 ngx_array_t *types_keys; |
1172 | 23 } ngx_http_sub_loc_conf_t; |
24 | |
25 | |
26 typedef enum { | |
27 sub_start_state = 0, | |
28 sub_match_state, | |
29 } ngx_http_sub_state_e; | |
30 | |
31 | |
32 typedef struct { | |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
33 ngx_str_t match; |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
34 ngx_str_t saved; |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
35 ngx_str_t looked; |
1172 | 36 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
37 ngx_uint_t once; /* unsigned once:1 */ |
1172 | 38 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
39 ngx_buf_t *buf; |
1172 | 40 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
41 u_char *pos; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
42 u_char *copy_start; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
43 u_char *copy_end; |
1172 | 44 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
45 ngx_chain_t *in; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
46 ngx_chain_t *out; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
47 ngx_chain_t **last_out; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
48 ngx_chain_t *busy; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
49 ngx_chain_t *free; |
1172 | 50 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
51 ngx_str_t sub; |
1172 | 52 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
53 ngx_uint_t state; |
1172 | 54 } ngx_http_sub_ctx_t; |
55 | |
56 | |
57 static ngx_int_t ngx_http_sub_output(ngx_http_request_t *r, | |
58 ngx_http_sub_ctx_t *ctx); | |
59 static ngx_int_t ngx_http_sub_parse(ngx_http_request_t *r, | |
60 ngx_http_sub_ctx_t *ctx); | |
61 | |
62 static char * ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd, | |
63 void *conf); | |
64 static void *ngx_http_sub_create_conf(ngx_conf_t *cf); | |
65 static char *ngx_http_sub_merge_conf(ngx_conf_t *cf, | |
66 void *parent, void *child); | |
67 static ngx_int_t ngx_http_sub_filter_init(ngx_conf_t *cf); | |
68 | |
69 | |
70 static ngx_command_t ngx_http_sub_filter_commands[] = { | |
71 | |
72 { ngx_string("sub_filter"), | |
73 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, | |
74 ngx_http_sub_filter, | |
75 NGX_HTTP_LOC_CONF_OFFSET, | |
76 0, | |
77 NULL }, | |
78 | |
79 { ngx_string("sub_filter_types"), | |
80 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
81 ngx_http_types_slot, |
1172 | 82 NGX_HTTP_LOC_CONF_OFFSET, |
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
83 offsetof(ngx_http_sub_loc_conf_t, types_keys), |
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
84 &ngx_http_html_default_types[0] }, |
1172 | 85 |
86 { ngx_string("sub_filter_once"), | |
87 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
88 ngx_conf_set_flag_slot, | |
89 NGX_HTTP_LOC_CONF_OFFSET, | |
90 offsetof(ngx_http_sub_loc_conf_t, once), | |
91 NULL }, | |
92 | |
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
93 { ngx_string("sub_filter_last_modified"), |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
94 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
95 ngx_conf_set_flag_slot, |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
96 NGX_HTTP_LOC_CONF_OFFSET, |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
97 offsetof(ngx_http_sub_loc_conf_t, last_modified), |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
98 NULL }, |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
99 |
1172 | 100 ngx_null_command |
101 }; | |
102 | |
103 | |
104 static ngx_http_module_t ngx_http_sub_filter_module_ctx = { | |
105 NULL, /* preconfiguration */ | |
106 ngx_http_sub_filter_init, /* postconfiguration */ | |
107 | |
108 NULL, /* create main configuration */ | |
109 NULL, /* init main configuration */ | |
110 | |
111 NULL, /* create server configuration */ | |
112 NULL, /* merge server configuration */ | |
113 | |
114 ngx_http_sub_create_conf, /* create location configuration */ | |
115 ngx_http_sub_merge_conf /* merge location configuration */ | |
116 }; | |
117 | |
118 | |
119 ngx_module_t ngx_http_sub_filter_module = { | |
120 NGX_MODULE_V1, | |
121 &ngx_http_sub_filter_module_ctx, /* module context */ | |
122 ngx_http_sub_filter_commands, /* module directives */ | |
123 NGX_HTTP_MODULE, /* module type */ | |
124 NULL, /* init master */ | |
125 NULL, /* init module */ | |
126 NULL, /* init process */ | |
127 NULL, /* init thread */ | |
128 NULL, /* exit thread */ | |
129 NULL, /* exit process */ | |
130 NULL, /* exit master */ | |
131 NGX_MODULE_V1_PADDING | |
132 }; | |
133 | |
134 | |
135 static ngx_http_output_header_filter_pt ngx_http_next_header_filter; | |
136 static ngx_http_output_body_filter_pt ngx_http_next_body_filter; | |
137 | |
138 | |
139 static ngx_int_t | |
140 ngx_http_sub_header_filter(ngx_http_request_t *r) | |
141 { | |
142 ngx_http_sub_ctx_t *ctx; | |
143 ngx_http_sub_loc_conf_t *slcf; | |
144 | |
145 slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module); | |
146 | |
147 if (slcf->match.len == 0 | |
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
148 || r->headers_out.content_length_n == 0 |
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
149 || ngx_http_test_content_type(r, &slcf->types) == NULL) |
1172 | 150 { |
151 return ngx_http_next_header_filter(r); | |
152 } | |
153 | |
154 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_sub_ctx_t)); | |
155 if (ctx == NULL) { | |
156 return NGX_ERROR; | |
157 } | |
158 | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
159 ctx->saved.data = ngx_pnalloc(r->pool, slcf->match.len); |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
160 if (ctx->saved.data == NULL) { |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
161 return NGX_ERROR; |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
162 } |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
163 |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
164 ctx->looked.data = ngx_pnalloc(r->pool, slcf->match.len); |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
165 if (ctx->looked.data == NULL) { |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
166 return NGX_ERROR; |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
167 } |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
168 |
1172 | 169 ngx_http_set_ctx(r, ctx, ngx_http_sub_filter_module); |
170 | |
171 ctx->match = slcf->match; | |
172 ctx->last_out = &ctx->out; | |
173 | |
174 r->filter_need_in_memory = 1; | |
175 | |
176 if (r == r->main) { | |
177 ngx_http_clear_content_length(r); | |
4746
4a18bf1833a9
Entity tags: clear on entity changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
178 ngx_http_clear_etag(r); |
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
179 |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
180 if (!slcf->last_modified) { |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
181 ngx_http_clear_last_modified(r); |
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
182 } |
1172 | 183 } |
184 | |
185 return ngx_http_next_header_filter(r); | |
186 } | |
187 | |
188 | |
189 static ngx_int_t | |
190 ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in) | |
191 { | |
192 ngx_int_t rc; | |
193 ngx_buf_t *b; | |
194 ngx_chain_t *cl; | |
195 ngx_http_sub_ctx_t *ctx; | |
196 ngx_http_sub_loc_conf_t *slcf; | |
197 | |
198 ctx = ngx_http_get_module_ctx(r, ngx_http_sub_filter_module); | |
199 | |
200 if (ctx == NULL) { | |
201 return ngx_http_next_body_filter(r, in); | |
202 } | |
203 | |
204 if ((in == NULL | |
205 && ctx->buf == NULL | |
206 && ctx->in == NULL | |
207 && ctx->busy == NULL)) | |
208 { | |
209 return ngx_http_next_body_filter(r, in); | |
210 } | |
211 | |
212 if (ctx->once && (ctx->buf == NULL || ctx->in == NULL)) { | |
213 | |
214 if (ctx->busy) { | |
215 if (ngx_http_sub_output(r, ctx) == NGX_ERROR) { | |
216 return NGX_ERROR; | |
217 } | |
218 } | |
219 | |
220 return ngx_http_next_body_filter(r, in); | |
221 } | |
222 | |
223 /* add the incoming chain to the chain ctx->in */ | |
224 | |
225 if (in) { | |
2536
a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents:
2414
diff
changeset
|
226 if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) { |
1172 | 227 return NGX_ERROR; |
228 } | |
229 } | |
230 | |
231 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
232 "http sub filter \"%V\"", &r->uri); | |
233 | |
234 while (ctx->in || ctx->buf) { | |
235 | |
3642 | 236 if (ctx->buf == NULL) { |
1172 | 237 ctx->buf = ctx->in->buf; |
238 ctx->in = ctx->in->next; | |
239 ctx->pos = ctx->buf->pos; | |
240 } | |
241 | |
242 if (ctx->state == sub_start_state) { | |
243 ctx->copy_start = ctx->pos; | |
244 ctx->copy_end = ctx->pos; | |
245 } | |
246 | |
247 b = NULL; | |
248 | |
249 while (ctx->pos < ctx->buf->last) { | |
250 | |
251 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
252 "saved: \"%V\" state: %d", &ctx->saved, ctx->state); |
1172 | 253 |
254 rc = ngx_http_sub_parse(r, ctx); | |
255 | |
256 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
257 "parse: %d, looked: \"%V\" %p-%p", |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
258 rc, &ctx->looked, ctx->copy_start, ctx->copy_end); |
1172 | 259 |
260 if (rc == NGX_ERROR) { | |
261 return rc; | |
262 } | |
263 | |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
264 if (ctx->saved.len) { |
1172 | 265 |
266 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
267 "saved: \"%V\"", &ctx->saved); |
1172 | 268 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
269 cl = ngx_chain_get_free_buf(r->pool, &ctx->free); |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
270 if (cl == NULL) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
271 return NGX_ERROR; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
272 } |
1172 | 273 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
274 b = cl->buf; |
1172 | 275 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
276 ngx_memzero(b, sizeof(ngx_buf_t)); |
1172 | 277 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
278 b->pos = ngx_pnalloc(r->pool, ctx->saved.len); |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
279 if (b->pos == NULL) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
280 return NGX_ERROR; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
281 } |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
282 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
283 ngx_memcpy(b->pos, ctx->saved.data, ctx->saved.len); |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
284 b->last = b->pos + ctx->saved.len; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
285 b->memory = 1; |
1172 | 286 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
287 *ctx->last_out = cl; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
288 ctx->last_out = &cl->next; |
1172 | 289 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
290 ctx->saved.len = 0; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
291 } |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
292 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
293 if (ctx->copy_start != ctx->copy_end) { |
1172 | 294 |
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
295 cl = ngx_chain_get_free_buf(r->pool, &ctx->free); |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
296 if (cl == NULL) { |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
297 return NGX_ERROR; |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
298 } |
1172 | 299 |
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
300 b = cl->buf; |
1172 | 301 |
302 ngx_memcpy(b, ctx->buf, sizeof(ngx_buf_t)); | |
303 | |
304 b->pos = ctx->copy_start; | |
305 b->last = ctx->copy_end; | |
306 b->shadow = NULL; | |
307 b->last_buf = 0; | |
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
308 b->last_in_chain = 0; |
1172 | 309 b->recycled = 0; |
310 | |
311 if (b->in_file) { | |
2079
333ef9e18a59
fix error when response parsed by sub filter, then by SSI filter
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
312 b->file_last = b->file_pos + (b->last - ctx->buf->pos); |
333ef9e18a59
fix error when response parsed by sub filter, then by SSI filter
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
313 b->file_pos += b->pos - ctx->buf->pos; |
1172 | 314 } |
315 | |
316 *ctx->last_out = cl; | |
317 ctx->last_out = &cl->next; | |
318 } | |
319 | |
320 if (ctx->state == sub_start_state) { | |
321 ctx->copy_start = ctx->pos; | |
322 ctx->copy_end = ctx->pos; | |
323 | |
324 } else { | |
325 ctx->copy_start = NULL; | |
326 ctx->copy_end = NULL; | |
327 } | |
328 | |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
329 if (ctx->looked.len > (size_t) (ctx->pos - ctx->buf->pos)) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
330 ctx->saved.len = ctx->looked.len - (ctx->pos - ctx->buf->pos); |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
331 ngx_memcpy(ctx->saved.data, ctx->looked.data, ctx->saved.len); |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
332 } |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
333 |
1172 | 334 if (rc == NGX_AGAIN) { |
335 continue; | |
336 } | |
337 | |
338 | |
339 /* rc == NGX_OK */ | |
340 | |
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
341 cl = ngx_chain_get_free_buf(r->pool, &ctx->free); |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
342 if (cl == NULL) { |
1172 | 343 return NGX_ERROR; |
344 } | |
345 | |
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
346 b = cl->buf; |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
347 |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
348 ngx_memzero(b, sizeof(ngx_buf_t)); |
1172 | 349 |
350 slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module); | |
351 | |
352 if (ctx->sub.data == NULL) { | |
353 | |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
354 if (ngx_http_complex_value(r, &slcf->value, &ctx->sub) |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
355 != NGX_OK) |
1172 | 356 { |
357 return NGX_ERROR; | |
358 } | |
359 } | |
360 | |
1555
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
361 if (ctx->sub.len) { |
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
362 b->memory = 1; |
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
363 b->pos = ctx->sub.data; |
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
364 b->last = ctx->sub.data + ctx->sub.len; |
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
365 |
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
366 } else { |
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
367 b->sync = 1; |
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
368 } |
1172 | 369 |
370 *ctx->last_out = cl; | |
371 ctx->last_out = &cl->next; | |
372 | |
373 ctx->once = slcf->once; | |
374 | |
375 continue; | |
376 } | |
377 | |
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
378 if (ctx->looked.len |
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
379 && (ctx->buf->last_buf || ctx->buf->last_in_chain)) |
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
380 { |
5287
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
381 cl = ngx_chain_get_free_buf(r->pool, &ctx->free); |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
382 if (cl == NULL) { |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
383 return NGX_ERROR; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
384 } |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
385 |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
386 b = cl->buf; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
387 |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
388 ngx_memzero(b, sizeof(ngx_buf_t)); |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
389 |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
390 b->pos = ctx->looked.data; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
391 b->last = b->pos + ctx->looked.len; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
392 b->memory = 1; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
393 |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
394 *ctx->last_out = cl; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
395 ctx->last_out = &cl->next; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
396 |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
397 ctx->looked.len = 0; |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
398 } |
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
399 |
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
400 if (ctx->buf->last_buf || ctx->buf->flush || ctx->buf->sync |
5286
819c5b53d8b5
Sub filter: flush buffers handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5285
diff
changeset
|
401 || ngx_buf_in_memory(ctx->buf)) |
819c5b53d8b5
Sub filter: flush buffers handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5285
diff
changeset
|
402 { |
1172 | 403 if (b == NULL) { |
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
404 cl = ngx_chain_get_free_buf(r->pool, &ctx->free); |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
405 if (cl == NULL) { |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
406 return NGX_ERROR; |
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
407 } |
1172 | 408 |
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
409 b = cl->buf; |
1172 | 410 |
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
411 ngx_memzero(b, sizeof(ngx_buf_t)); |
1172 | 412 |
413 b->sync = 1; | |
414 | |
415 *ctx->last_out = cl; | |
416 ctx->last_out = &cl->next; | |
417 } | |
418 | |
419 b->last_buf = ctx->buf->last_buf; | |
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
420 b->last_in_chain = ctx->buf->last_in_chain; |
5286
819c5b53d8b5
Sub filter: flush buffers handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5285
diff
changeset
|
421 b->flush = ctx->buf->flush; |
1172 | 422 b->shadow = ctx->buf; |
423 | |
424 b->recycled = ctx->buf->recycled; | |
425 } | |
426 | |
427 ctx->buf = NULL; | |
428 | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
429 ctx->saved.len = ctx->looked.len; |
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
430 ngx_memcpy(ctx->saved.data, ctx->looked.data, ctx->looked.len); |
1172 | 431 } |
432 | |
433 if (ctx->out == NULL && ctx->busy == NULL) { | |
434 return NGX_OK; | |
435 } | |
436 | |
437 return ngx_http_sub_output(r, ctx); | |
438 } | |
439 | |
440 | |
441 static ngx_int_t | |
442 ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx) | |
443 { | |
444 ngx_int_t rc; | |
445 ngx_buf_t *b; | |
446 ngx_chain_t *cl; | |
447 | |
448 #if 1 | |
449 b = NULL; | |
450 for (cl = ctx->out; cl; cl = cl->next) { | |
451 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
452 "sub out: %p %p", cl->buf, cl->buf->pos); | |
453 if (cl->buf == b) { | |
454 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, | |
455 "the same buf was used in sub"); | |
456 ngx_debug_point(); | |
457 return NGX_ERROR; | |
458 } | |
459 b = cl->buf; | |
460 } | |
461 #endif | |
462 | |
463 rc = ngx_http_next_body_filter(r, ctx->out); | |
464 | |
465 if (ctx->busy == NULL) { | |
466 ctx->busy = ctx->out; | |
467 | |
468 } else { | |
469 for (cl = ctx->busy; cl->next; cl = cl->next) { /* void */ } | |
470 cl->next = ctx->out; | |
471 } | |
472 | |
473 ctx->out = NULL; | |
474 ctx->last_out = &ctx->out; | |
475 | |
476 while (ctx->busy) { | |
477 | |
478 cl = ctx->busy; | |
479 b = cl->buf; | |
480 | |
481 if (ngx_buf_size(b) != 0) { | |
482 break; | |
483 } | |
484 | |
485 if (b->shadow) { | |
486 b->shadow->pos = b->shadow->last; | |
487 } | |
488 | |
489 ctx->busy = cl->next; | |
490 | |
491 if (ngx_buf_in_memory(b) || b->in_file) { | |
492 /* add data bufs only to the free buf chain */ | |
493 | |
494 cl->next = ctx->free; | |
495 ctx->free = cl; | |
496 } | |
497 } | |
498 | |
499 if (ctx->in || ctx->buf) { | |
500 r->buffered |= NGX_HTTP_SUB_BUFFERED; | |
501 | |
502 } else { | |
503 r->buffered &= ~NGX_HTTP_SUB_BUFFERED; | |
504 } | |
505 | |
506 return rc; | |
507 } | |
508 | |
509 | |
510 static ngx_int_t | |
511 ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx) | |
512 { | |
513 u_char *p, *last, *copy_end, ch, match; | |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
514 size_t looked, i; |
1172 | 515 ngx_http_sub_state_e state; |
516 | |
517 if (ctx->once) { | |
518 ctx->copy_start = ctx->pos; | |
519 ctx->copy_end = ctx->buf->last; | |
520 ctx->pos = ctx->buf->last; | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
521 ctx->looked.len = 0; |
1172 | 522 |
523 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "once"); | |
524 | |
525 return NGX_AGAIN; | |
526 } | |
527 | |
528 state = ctx->state; | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
529 looked = ctx->looked.len; |
1172 | 530 last = ctx->buf->last; |
531 copy_end = ctx->copy_end; | |
532 | |
533 for (p = ctx->pos; p < last; p++) { | |
534 | |
535 ch = *p; | |
536 ch = ngx_tolower(ch); | |
537 | |
538 if (state == sub_start_state) { | |
539 | |
540 /* the tight loop */ | |
541 | |
542 match = ctx->match.data[0]; | |
543 | |
544 for ( ;; ) { | |
545 if (ch == match) { | |
546 copy_end = p; | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
547 ctx->looked.data[0] = *p; |
1172 | 548 looked = 1; |
549 state = sub_match_state; | |
550 | |
551 goto match_started; | |
552 } | |
553 | |
554 if (++p == last) { | |
555 break; | |
556 } | |
557 | |
558 ch = *p; | |
559 ch = ngx_tolower(ch); | |
560 } | |
561 | |
1557
9d094e581587
*) add sub_filter parser fix similar to r1261 in SSI parser
Igor Sysoev <igor@sysoev.ru>
parents:
1555
diff
changeset
|
562 ctx->state = state; |
1172 | 563 ctx->pos = p; |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
564 ctx->looked.len = looked; |
1172 | 565 ctx->copy_end = p; |
566 | |
567 if (ctx->copy_start == NULL) { | |
568 ctx->copy_start = ctx->buf->pos; | |
569 } | |
570 | |
571 return NGX_AGAIN; | |
572 | |
573 match_started: | |
574 | |
575 continue; | |
576 } | |
577 | |
578 /* state == sub_match_state */ | |
579 | |
580 if (ch == ctx->match.data[looked]) { | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
581 ctx->looked.data[looked] = *p; |
1172 | 582 looked++; |
583 | |
584 if (looked == ctx->match.len) { | |
1557
9d094e581587
*) add sub_filter parser fix similar to r1261 in SSI parser
Igor Sysoev <igor@sysoev.ru>
parents:
1555
diff
changeset
|
585 |
1172 | 586 ctx->state = sub_start_state; |
587 ctx->pos = p + 1; | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
588 ctx->looked.len = 0; |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
589 ctx->saved.len = 0; |
1172 | 590 ctx->copy_end = copy_end; |
591 | |
592 if (ctx->copy_start == NULL && copy_end) { | |
593 ctx->copy_start = ctx->buf->pos; | |
594 } | |
595 | |
596 return NGX_OK; | |
597 } | |
598 | |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
599 } else { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
600 /* |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
601 * check if there is another partial match in previously |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
602 * matched substring to catch cases like "aab" in "aaab" |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
603 */ |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
604 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
605 ctx->looked.data[looked] = *p; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
606 looked++; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
607 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
608 for (i = 1; i < looked; i++) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
609 if (ngx_strncasecmp(ctx->looked.data + i, |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
610 ctx->match.data, looked - i) |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
611 == 0) |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
612 { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
613 break; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
614 } |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
615 } |
1172 | 616 |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
617 if (i < looked) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
618 if (ctx->saved.len > i) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
619 ctx->saved.len = i; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
620 } |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
621 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
622 if ((size_t) (p + 1 - ctx->buf->pos) >= looked - i) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
623 copy_end = p + 1 - (looked - i); |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
624 } |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
625 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
626 ngx_memmove(ctx->looked.data, ctx->looked.data + i, looked - i); |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
627 looked = looked - i; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
628 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
629 } else { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
630 copy_end = p; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
631 looked = 0; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
632 state = sub_start_state; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
633 } |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
634 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
635 if (ctx->saved.len) { |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
636 p++; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
637 goto out; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
638 } |
1172 | 639 } |
640 } | |
641 | |
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
642 ctx->saved.len = 0; |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
643 |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
644 out: |
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
645 |
1172 | 646 ctx->state = state; |
647 ctx->pos = p; | |
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
648 ctx->looked.len = looked; |
1172 | 649 |
650 ctx->copy_end = (state == sub_start_state) ? p : copy_end; | |
651 | |
652 if (ctx->copy_start == NULL && ctx->copy_end) { | |
653 ctx->copy_start = ctx->buf->pos; | |
654 } | |
655 | |
656 return NGX_AGAIN; | |
657 } | |
658 | |
659 | |
660 static char * | |
661 ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
662 { | |
663 ngx_http_sub_loc_conf_t *slcf = conf; | |
664 | |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
665 ngx_str_t *value; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
666 ngx_http_compile_complex_value_t ccv; |
1172 | 667 |
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4746
diff
changeset
|
668 if (slcf->match.data) { |
1172 | 669 return "is duplicate"; |
670 } | |
671 | |
672 value = cf->args->elts; | |
673 | |
2135 | 674 ngx_strlow(value[1].data, value[1].data, value[1].len); |
1172 | 675 |
2135 | 676 slcf->match = value[1]; |
1172 | 677 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
678 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
1172 | 679 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
680 ccv.cf = cf; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
681 ccv.value = &value[2]; |
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
682 ccv.complex_value = &slcf->value; |
1172 | 683 |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
684 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
1172 | 685 return NGX_CONF_ERROR; |
686 } | |
687 | |
688 return NGX_CONF_OK; | |
689 } | |
690 | |
691 | |
692 static void * | |
693 ngx_http_sub_create_conf(ngx_conf_t *cf) | |
694 { | |
695 ngx_http_sub_loc_conf_t *slcf; | |
696 | |
697 slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_sub_loc_conf_t)); | |
698 if (slcf == NULL) { | |
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2588
diff
changeset
|
699 return NULL; |
1172 | 700 } |
701 | |
702 /* | |
703 * set by ngx_pcalloc(): | |
704 * | |
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
705 * conf->match = { 0, NULL }; |
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
706 * conf->types = { NULL }; |
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
707 * conf->types_keys = NULL; |
1172 | 708 */ |
709 | |
710 slcf->once = NGX_CONF_UNSET; | |
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
711 slcf->last_modified = NGX_CONF_UNSET; |
1172 | 712 |
713 return slcf; | |
714 } | |
715 | |
716 | |
717 static char * | |
718 ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child) | |
719 { | |
720 ngx_http_sub_loc_conf_t *prev = parent; | |
721 ngx_http_sub_loc_conf_t *conf = child; | |
722 | |
723 ngx_conf_merge_value(conf->once, prev->once, 1); | |
724 ngx_conf_merge_str_value(conf->match, prev->match, ""); | |
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
725 ngx_conf_merge_value(conf->last_modified, prev->last_modified, 0); |
1172 | 726 |
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4746
diff
changeset
|
727 if (conf->value.value.data == NULL) { |
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
728 conf->value = prev->value; |
1172 | 729 } |
730 | |
3372
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
731 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, |
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
732 &prev->types_keys, &prev->types, |
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
733 ngx_http_html_default_types) |
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
734 != NGX_OK) |
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
735 { |
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
736 return NGX_CONF_ERROR; |
1172 | 737 } |
738 | |
739 return NGX_CONF_OK; | |
740 } | |
741 | |
742 | |
743 static ngx_int_t | |
744 ngx_http_sub_filter_init(ngx_conf_t *cf) | |
745 { | |
746 ngx_http_next_header_filter = ngx_http_top_header_filter; | |
747 ngx_http_top_header_filter = ngx_http_sub_header_filter; | |
748 | |
749 ngx_http_next_body_filter = ngx_http_top_body_filter; | |
750 ngx_http_top_body_filter = ngx_http_sub_body_filter; | |
751 | |
752 return NGX_OK; | |
753 } |