Mercurial > hg > nginx-quic
annotate src/http/modules/ngx_http_sub_filter_module.c @ 5948:f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Currently, storing and caching mechanisms cannot work together, and a
configuration error is thrown when the proxy_store and proxy_cache
directives (as well as their friends) are configured on the same level.
But configurations like in the example below were allowed and could result
in critical errors in the error log:
proxy_store on;
location / {
proxy_cache one;
}
Only proxy_store worked in this case.
For more predictable and errorless behavior these directives now prevent
each other from being inherited from the previous level.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Mon, 22 Dec 2014 12:58:59 +0300 |
| parents | 5322be87fc02 |
| children | b9447fc457b4 |
| 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); | |
|
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
178 |
|
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
179 if (!slcf->last_modified) { |
|
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
180 ngx_http_clear_last_modified(r); |
|
5733
e491b26fa5a1
Entity tags: downgrade strong etags to weak ones as needed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5710
diff
changeset
|
181 ngx_http_clear_etag(r); |
|
e491b26fa5a1
Entity tags: downgrade strong etags to weak ones as needed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5710
diff
changeset
|
182 |
|
e491b26fa5a1
Entity tags: downgrade strong etags to weak ones as needed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5710
diff
changeset
|
183 } else { |
|
e491b26fa5a1
Entity tags: downgrade strong etags to weak ones as needed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5710
diff
changeset
|
184 ngx_http_weak_etag(r); |
|
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
185 } |
| 1172 | 186 } |
| 187 | |
| 188 return ngx_http_next_header_filter(r); | |
| 189 } | |
| 190 | |
| 191 | |
| 192 static ngx_int_t | |
| 193 ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in) | |
| 194 { | |
| 195 ngx_int_t rc; | |
| 196 ngx_buf_t *b; | |
| 197 ngx_chain_t *cl; | |
| 198 ngx_http_sub_ctx_t *ctx; | |
| 199 ngx_http_sub_loc_conf_t *slcf; | |
| 200 | |
| 201 ctx = ngx_http_get_module_ctx(r, ngx_http_sub_filter_module); | |
| 202 | |
| 203 if (ctx == NULL) { | |
| 204 return ngx_http_next_body_filter(r, in); | |
| 205 } | |
| 206 | |
| 207 if ((in == NULL | |
| 208 && ctx->buf == NULL | |
| 209 && ctx->in == NULL | |
| 210 && ctx->busy == NULL)) | |
| 211 { | |
| 212 return ngx_http_next_body_filter(r, in); | |
| 213 } | |
| 214 | |
| 215 if (ctx->once && (ctx->buf == NULL || ctx->in == NULL)) { | |
| 216 | |
| 217 if (ctx->busy) { | |
| 218 if (ngx_http_sub_output(r, ctx) == NGX_ERROR) { | |
| 219 return NGX_ERROR; | |
| 220 } | |
| 221 } | |
| 222 | |
| 223 return ngx_http_next_body_filter(r, in); | |
| 224 } | |
| 225 | |
| 226 /* add the incoming chain to the chain ctx->in */ | |
| 227 | |
| 228 if (in) { | |
|
2536
a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents:
2414
diff
changeset
|
229 if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) { |
| 1172 | 230 return NGX_ERROR; |
| 231 } | |
| 232 } | |
| 233 | |
| 234 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 235 "http sub filter \"%V\"", &r->uri); | |
| 236 | |
| 237 while (ctx->in || ctx->buf) { | |
| 238 | |
| 3642 | 239 if (ctx->buf == NULL) { |
| 1172 | 240 ctx->buf = ctx->in->buf; |
| 241 ctx->in = ctx->in->next; | |
| 242 ctx->pos = ctx->buf->pos; | |
| 243 } | |
| 244 | |
| 245 if (ctx->state == sub_start_state) { | |
| 246 ctx->copy_start = ctx->pos; | |
| 247 ctx->copy_end = ctx->pos; | |
| 248 } | |
| 249 | |
| 250 b = NULL; | |
| 251 | |
| 252 while (ctx->pos < ctx->buf->last) { | |
| 253 | |
| 254 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
|
255 "saved: \"%V\" state: %d", &ctx->saved, ctx->state); |
| 1172 | 256 |
| 257 rc = ngx_http_sub_parse(r, ctx); | |
| 258 | |
| 259 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
|
260 "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
|
261 rc, &ctx->looked, ctx->copy_start, ctx->copy_end); |
| 1172 | 262 |
| 263 if (rc == NGX_ERROR) { | |
| 264 return rc; | |
| 265 } | |
| 266 | |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
267 if (ctx->saved.len) { |
| 1172 | 268 |
| 269 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
|
270 "saved: \"%V\"", &ctx->saved); |
| 1172 | 271 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
272 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
|
273 if (cl == NULL) { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
274 return NGX_ERROR; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
275 } |
| 1172 | 276 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
277 b = cl->buf; |
| 1172 | 278 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
279 ngx_memzero(b, sizeof(ngx_buf_t)); |
| 1172 | 280 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
281 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
|
282 if (b->pos == NULL) { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
283 return NGX_ERROR; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
284 } |
|
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
285 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
286 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
|
287 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
|
288 b->memory = 1; |
| 1172 | 289 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
290 *ctx->last_out = cl; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
291 ctx->last_out = &cl->next; |
| 1172 | 292 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
293 ctx->saved.len = 0; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
294 } |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
295 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
296 if (ctx->copy_start != ctx->copy_end) { |
| 1172 | 297 |
|
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
298 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
|
299 if (cl == NULL) { |
|
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
300 return NGX_ERROR; |
|
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
301 } |
| 1172 | 302 |
|
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
303 b = cl->buf; |
| 1172 | 304 |
| 305 ngx_memcpy(b, ctx->buf, sizeof(ngx_buf_t)); | |
| 306 | |
| 307 b->pos = ctx->copy_start; | |
| 308 b->last = ctx->copy_end; | |
| 309 b->shadow = NULL; | |
| 310 b->last_buf = 0; | |
|
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
311 b->last_in_chain = 0; |
| 1172 | 312 b->recycled = 0; |
| 313 | |
| 314 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
|
315 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
|
316 b->file_pos += b->pos - ctx->buf->pos; |
| 1172 | 317 } |
| 318 | |
| 319 *ctx->last_out = cl; | |
| 320 ctx->last_out = &cl->next; | |
| 321 } | |
| 322 | |
| 323 if (ctx->state == sub_start_state) { | |
| 324 ctx->copy_start = ctx->pos; | |
| 325 ctx->copy_end = ctx->pos; | |
| 326 | |
| 327 } else { | |
| 328 ctx->copy_start = NULL; | |
| 329 ctx->copy_end = NULL; | |
| 330 } | |
| 331 | |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
332 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
|
333 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
|
334 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
|
335 } |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
336 |
| 1172 | 337 if (rc == NGX_AGAIN) { |
| 338 continue; | |
| 339 } | |
| 340 | |
| 341 | |
| 342 /* rc == NGX_OK */ | |
| 343 | |
|
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
344 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
|
345 if (cl == NULL) { |
| 1172 | 346 return NGX_ERROR; |
| 347 } | |
| 348 | |
|
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
349 b = cl->buf; |
|
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
350 |
|
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
351 ngx_memzero(b, sizeof(ngx_buf_t)); |
| 1172 | 352 |
| 353 slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module); | |
| 354 | |
| 355 if (ctx->sub.data == NULL) { | |
| 356 | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
357 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
|
358 != NGX_OK) |
| 1172 | 359 { |
| 360 return NGX_ERROR; | |
| 361 } | |
| 362 } | |
| 363 | |
|
1555
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
364 if (ctx->sub.len) { |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
365 b->memory = 1; |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
366 b->pos = ctx->sub.data; |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
367 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
|
368 |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
369 } else { |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
370 b->sync = 1; |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
371 } |
| 1172 | 372 |
| 373 *ctx->last_out = cl; | |
| 374 ctx->last_out = &cl->next; | |
| 375 | |
| 376 ctx->once = slcf->once; | |
| 377 | |
| 378 continue; | |
| 379 } | |
| 380 | |
|
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
381 if (ctx->looked.len |
|
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
382 && (ctx->buf->last_buf || ctx->buf->last_in_chain)) |
|
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
383 { |
|
5287
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
384 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
|
385 if (cl == NULL) { |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
386 return NGX_ERROR; |
|
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 |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
389 b = cl->buf; |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
390 |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
391 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
|
392 |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
393 b->pos = ctx->looked.data; |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
394 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
|
395 b->memory = 1; |
|
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->last_out = cl; |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
398 ctx->last_out = &cl->next; |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
399 |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
400 ctx->looked.len = 0; |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
401 } |
|
2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5286
diff
changeset
|
402 |
|
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
403 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
|
404 || ngx_buf_in_memory(ctx->buf)) |
|
819c5b53d8b5
Sub filter: flush buffers handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5285
diff
changeset
|
405 { |
| 1172 | 406 if (b == NULL) { |
|
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
407 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
|
408 if (cl == NULL) { |
|
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
409 return NGX_ERROR; |
|
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
410 } |
| 1172 | 411 |
|
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
412 b = cl->buf; |
| 1172 | 413 |
|
5285
d47ef93134e5
Sub filter: switched to ngx_chain_get_free_buf().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5284
diff
changeset
|
414 ngx_memzero(b, sizeof(ngx_buf_t)); |
| 1172 | 415 |
| 416 b->sync = 1; | |
| 417 | |
| 418 *ctx->last_out = cl; | |
| 419 ctx->last_out = &cl->next; | |
| 420 } | |
| 421 | |
| 422 b->last_buf = ctx->buf->last_buf; | |
|
5710
9e9c1310d17c
Sub filter: fixed subrequests handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5288
diff
changeset
|
423 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
|
424 b->flush = ctx->buf->flush; |
| 1172 | 425 b->shadow = ctx->buf; |
| 426 | |
| 427 b->recycled = ctx->buf->recycled; | |
| 428 } | |
| 429 | |
| 430 ctx->buf = NULL; | |
| 431 | |
|
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
432 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
|
433 ngx_memcpy(ctx->saved.data, ctx->looked.data, ctx->looked.len); |
| 1172 | 434 } |
| 435 | |
| 436 if (ctx->out == NULL && ctx->busy == NULL) { | |
| 437 return NGX_OK; | |
| 438 } | |
| 439 | |
| 440 return ngx_http_sub_output(r, ctx); | |
| 441 } | |
| 442 | |
| 443 | |
| 444 static ngx_int_t | |
| 445 ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx) | |
| 446 { | |
| 447 ngx_int_t rc; | |
| 448 ngx_buf_t *b; | |
| 449 ngx_chain_t *cl; | |
| 450 | |
| 451 #if 1 | |
| 452 b = NULL; | |
| 453 for (cl = ctx->out; cl; cl = cl->next) { | |
| 454 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 455 "sub out: %p %p", cl->buf, cl->buf->pos); | |
| 456 if (cl->buf == b) { | |
| 457 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, | |
| 458 "the same buf was used in sub"); | |
| 459 ngx_debug_point(); | |
| 460 return NGX_ERROR; | |
| 461 } | |
| 462 b = cl->buf; | |
| 463 } | |
| 464 #endif | |
| 465 | |
| 466 rc = ngx_http_next_body_filter(r, ctx->out); | |
| 467 | |
| 468 if (ctx->busy == NULL) { | |
| 469 ctx->busy = ctx->out; | |
| 470 | |
| 471 } else { | |
| 472 for (cl = ctx->busy; cl->next; cl = cl->next) { /* void */ } | |
| 473 cl->next = ctx->out; | |
| 474 } | |
| 475 | |
| 476 ctx->out = NULL; | |
| 477 ctx->last_out = &ctx->out; | |
| 478 | |
| 479 while (ctx->busy) { | |
| 480 | |
| 481 cl = ctx->busy; | |
| 482 b = cl->buf; | |
| 483 | |
| 484 if (ngx_buf_size(b) != 0) { | |
| 485 break; | |
| 486 } | |
| 487 | |
| 488 if (b->shadow) { | |
| 489 b->shadow->pos = b->shadow->last; | |
| 490 } | |
| 491 | |
| 492 ctx->busy = cl->next; | |
| 493 | |
| 494 if (ngx_buf_in_memory(b) || b->in_file) { | |
| 495 /* add data bufs only to the free buf chain */ | |
| 496 | |
| 497 cl->next = ctx->free; | |
| 498 ctx->free = cl; | |
| 499 } | |
| 500 } | |
| 501 | |
| 502 if (ctx->in || ctx->buf) { | |
| 503 r->buffered |= NGX_HTTP_SUB_BUFFERED; | |
| 504 | |
| 505 } else { | |
| 506 r->buffered &= ~NGX_HTTP_SUB_BUFFERED; | |
| 507 } | |
| 508 | |
| 509 return rc; | |
| 510 } | |
| 511 | |
| 512 | |
| 513 static ngx_int_t | |
| 514 ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx) | |
| 515 { | |
| 516 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
|
517 size_t looked, i; |
| 1172 | 518 ngx_http_sub_state_e state; |
| 519 | |
| 520 if (ctx->once) { | |
| 521 ctx->copy_start = ctx->pos; | |
| 522 ctx->copy_end = ctx->buf->last; | |
| 523 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
|
524 ctx->looked.len = 0; |
| 1172 | 525 |
| 526 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "once"); | |
| 527 | |
| 528 return NGX_AGAIN; | |
| 529 } | |
| 530 | |
| 531 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
|
532 looked = ctx->looked.len; |
| 1172 | 533 last = ctx->buf->last; |
| 534 copy_end = ctx->copy_end; | |
| 535 | |
| 536 for (p = ctx->pos; p < last; p++) { | |
| 537 | |
| 538 ch = *p; | |
| 539 ch = ngx_tolower(ch); | |
| 540 | |
| 541 if (state == sub_start_state) { | |
| 542 | |
| 543 /* the tight loop */ | |
| 544 | |
| 545 match = ctx->match.data[0]; | |
| 546 | |
| 547 for ( ;; ) { | |
| 548 if (ch == match) { | |
|
5810
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
549 |
|
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
550 if (ctx->match.len == 1) { |
|
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
551 ctx->pos = p + 1; |
|
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
552 ctx->copy_end = p; |
|
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
553 |
|
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
554 return NGX_OK; |
|
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
555 } |
|
5322be87fc02
Sub filter: fixed matching for a single character.
Valentin Bartenev <vbart@nginx.com>
parents:
5733
diff
changeset
|
556 |
| 1172 | 557 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
|
558 ctx->looked.data[0] = *p; |
| 1172 | 559 looked = 1; |
| 560 state = sub_match_state; | |
| 561 | |
| 562 goto match_started; | |
| 563 } | |
| 564 | |
| 565 if (++p == last) { | |
| 566 break; | |
| 567 } | |
| 568 | |
| 569 ch = *p; | |
| 570 ch = ngx_tolower(ch); | |
| 571 } | |
| 572 | |
|
1557
9d094e581587
*) add sub_filter parser fix similar to r1261 in SSI parser
Igor Sysoev <igor@sysoev.ru>
parents:
1555
diff
changeset
|
573 ctx->state = state; |
| 1172 | 574 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
|
575 ctx->looked.len = looked; |
| 1172 | 576 ctx->copy_end = p; |
| 577 | |
| 578 if (ctx->copy_start == NULL) { | |
| 579 ctx->copy_start = ctx->buf->pos; | |
| 580 } | |
| 581 | |
| 582 return NGX_AGAIN; | |
| 583 | |
| 584 match_started: | |
| 585 | |
| 586 continue; | |
| 587 } | |
| 588 | |
| 589 /* state == sub_match_state */ | |
| 590 | |
| 591 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
|
592 ctx->looked.data[looked] = *p; |
| 1172 | 593 looked++; |
| 594 | |
| 595 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
|
596 |
| 1172 | 597 ctx->state = sub_start_state; |
| 598 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
|
599 ctx->looked.len = 0; |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
600 ctx->saved.len = 0; |
| 1172 | 601 ctx->copy_end = copy_end; |
| 602 | |
| 603 if (ctx->copy_start == NULL && copy_end) { | |
| 604 ctx->copy_start = ctx->buf->pos; | |
| 605 } | |
| 606 | |
| 607 return NGX_OK; | |
| 608 } | |
| 609 | |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
610 } else { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
611 /* |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
612 * 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
|
613 * 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
|
614 */ |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
615 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
616 ctx->looked.data[looked] = *p; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
617 looked++; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
618 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
619 for (i = 1; i < looked; i++) { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
620 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
|
621 ctx->match.data, looked - i) |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
622 == 0) |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
623 { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
624 break; |
|
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 } |
| 1172 | 627 |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
628 if (i < looked) { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
629 if (ctx->saved.len > i) { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
630 ctx->saved.len = i; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
631 } |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
632 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
633 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
|
634 copy_end = p + 1 - (looked - i); |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
635 } |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
636 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
637 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
|
638 looked = looked - i; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
639 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
640 } else { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
641 copy_end = p; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
642 looked = 0; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
643 state = sub_start_state; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
644 } |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
645 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
646 if (ctx->saved.len) { |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
647 p++; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
648 goto out; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
649 } |
| 1172 | 650 } |
| 651 } | |
| 652 | |
|
5288
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
653 ctx->saved.len = 0; |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
654 |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
655 out: |
|
102d7117ffb8
Sub filter: fixed matching after a partial match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5287
diff
changeset
|
656 |
| 1172 | 657 ctx->state = state; |
| 658 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
|
659 ctx->looked.len = looked; |
| 1172 | 660 |
| 661 ctx->copy_end = (state == sub_start_state) ? p : copy_end; | |
| 662 | |
| 663 if (ctx->copy_start == NULL && ctx->copy_end) { | |
| 664 ctx->copy_start = ctx->buf->pos; | |
| 665 } | |
| 666 | |
| 667 return NGX_AGAIN; | |
| 668 } | |
| 669 | |
| 670 | |
| 671 static char * | |
| 672 ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 673 { | |
| 674 ngx_http_sub_loc_conf_t *slcf = conf; | |
| 675 | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
676 ngx_str_t *value; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
677 ngx_http_compile_complex_value_t ccv; |
| 1172 | 678 |
|
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4746
diff
changeset
|
679 if (slcf->match.data) { |
| 1172 | 680 return "is duplicate"; |
| 681 } | |
| 682 | |
| 683 value = cf->args->elts; | |
| 684 | |
| 2135 | 685 ngx_strlow(value[1].data, value[1].data, value[1].len); |
| 1172 | 686 |
| 2135 | 687 slcf->match = value[1]; |
| 1172 | 688 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
689 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
| 1172 | 690 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
691 ccv.cf = cf; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
692 ccv.value = &value[2]; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
693 ccv.complex_value = &slcf->value; |
| 1172 | 694 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
695 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
| 1172 | 696 return NGX_CONF_ERROR; |
| 697 } | |
| 698 | |
| 699 return NGX_CONF_OK; | |
| 700 } | |
| 701 | |
| 702 | |
| 703 static void * | |
| 704 ngx_http_sub_create_conf(ngx_conf_t *cf) | |
| 705 { | |
| 706 ngx_http_sub_loc_conf_t *slcf; | |
| 707 | |
| 708 slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_sub_loc_conf_t)); | |
| 709 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
|
710 return NULL; |
| 1172 | 711 } |
| 712 | |
| 713 /* | |
| 714 * set by ngx_pcalloc(): | |
| 715 * | |
|
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
716 * 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
|
717 * conf->types = { NULL }; |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
718 * conf->types_keys = NULL; |
| 1172 | 719 */ |
| 720 | |
| 721 slcf->once = NGX_CONF_UNSET; | |
|
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
722 slcf->last_modified = NGX_CONF_UNSET; |
| 1172 | 723 |
| 724 return slcf; | |
| 725 } | |
| 726 | |
| 727 | |
| 728 static char * | |
| 729 ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 730 { | |
| 731 ngx_http_sub_loc_conf_t *prev = parent; | |
| 732 ngx_http_sub_loc_conf_t *conf = child; | |
| 733 | |
| 734 ngx_conf_merge_value(conf->once, prev->once, 1); | |
| 735 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
|
736 ngx_conf_merge_value(conf->last_modified, prev->last_modified, 0); |
| 1172 | 737 |
|
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4746
diff
changeset
|
738 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
|
739 conf->value = prev->value; |
| 1172 | 740 } |
| 741 | |
|
3372
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
742 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
|
743 &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
|
744 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
|
745 != NGX_OK) |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
746 { |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
747 return NGX_CONF_ERROR; |
| 1172 | 748 } |
| 749 | |
| 750 return NGX_CONF_OK; | |
| 751 } | |
| 752 | |
| 753 | |
| 754 static ngx_int_t | |
| 755 ngx_http_sub_filter_init(ngx_conf_t *cf) | |
| 756 { | |
| 757 ngx_http_next_header_filter = ngx_http_top_header_filter; | |
| 758 ngx_http_top_header_filter = ngx_http_sub_header_filter; | |
| 759 | |
| 760 ngx_http_next_body_filter = ngx_http_top_body_filter; | |
| 761 ngx_http_top_body_filter = ngx_http_sub_body_filter; | |
| 762 | |
| 763 return NGX_OK; | |
| 764 } |