Mercurial > hg > nginx
annotate src/http/modules/ngx_http_sub_filter_module.c @ 5229:4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Directive is similar to ssi_last_modified introduced by previous commit.
Patch by Alexey Kolpakov.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Fri, 24 May 2013 22:27:30 +0400 |
| parents | 4251e72b8bb4 |
| children | eaa9c732a1b9 |
| 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 | |
| 264 if (ctx->copy_start != ctx->copy_end) { | |
| 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 |
|
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
269 if (ctx->saved.len) { |
| 1172 | 270 |
| 271 if (ctx->free) { | |
| 272 cl = ctx->free; | |
| 273 ctx->free = ctx->free->next; | |
| 274 b = cl->buf; | |
| 275 ngx_memzero(b, sizeof(ngx_buf_t)); | |
| 276 | |
| 277 } else { | |
| 278 b = ngx_calloc_buf(r->pool); | |
| 279 if (b == NULL) { | |
| 280 return NGX_ERROR; | |
| 281 } | |
| 282 | |
| 283 cl = ngx_alloc_chain_link(r->pool); | |
| 284 if (cl == NULL) { | |
| 285 return NGX_ERROR; | |
| 286 } | |
| 287 | |
| 288 cl->buf = b; | |
| 289 } | |
| 290 | |
|
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
291 b->pos = ngx_pnalloc(r->pool, ctx->saved.len); |
|
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
292 if (b->pos == NULL) { |
|
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
293 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
|
294 } |
|
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
295 |
|
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
296 ngx_memcpy(b->pos, ctx->saved.data, ctx->saved.len); |
|
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
297 b->last = b->pos + ctx->saved.len; |
| 1172 | 298 b->memory = 1; |
| 299 | |
| 300 *ctx->last_out = cl; | |
| 301 ctx->last_out = &cl->next; | |
| 302 | |
|
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
303 ctx->saved.len = 0; |
| 1172 | 304 } |
| 305 | |
| 306 if (ctx->free) { | |
| 307 cl = ctx->free; | |
| 308 ctx->free = ctx->free->next; | |
| 309 b = cl->buf; | |
| 310 | |
| 311 } else { | |
| 312 b = ngx_alloc_buf(r->pool); | |
| 313 if (b == NULL) { | |
| 314 return NGX_ERROR; | |
| 315 } | |
| 316 | |
| 317 cl = ngx_alloc_chain_link(r->pool); | |
| 318 if (cl == NULL) { | |
| 319 return NGX_ERROR; | |
| 320 } | |
| 321 | |
| 322 cl->buf = b; | |
| 323 } | |
| 324 | |
| 325 ngx_memcpy(b, ctx->buf, sizeof(ngx_buf_t)); | |
| 326 | |
| 327 b->pos = ctx->copy_start; | |
| 328 b->last = ctx->copy_end; | |
| 329 b->shadow = NULL; | |
| 330 b->last_buf = 0; | |
| 331 b->recycled = 0; | |
| 332 | |
| 333 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
|
334 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
|
335 b->file_pos += b->pos - ctx->buf->pos; |
| 1172 | 336 } |
| 337 | |
| 338 cl->next = NULL; | |
| 339 *ctx->last_out = cl; | |
| 340 ctx->last_out = &cl->next; | |
| 341 } | |
| 342 | |
| 343 if (ctx->state == sub_start_state) { | |
| 344 ctx->copy_start = ctx->pos; | |
| 345 ctx->copy_end = ctx->pos; | |
| 346 | |
| 347 } else { | |
| 348 ctx->copy_start = NULL; | |
| 349 ctx->copy_end = NULL; | |
| 350 } | |
| 351 | |
| 352 if (rc == NGX_AGAIN) { | |
| 353 continue; | |
| 354 } | |
| 355 | |
| 356 | |
| 357 /* rc == NGX_OK */ | |
| 358 | |
| 359 b = ngx_calloc_buf(r->pool); | |
| 360 if (b == NULL) { | |
| 361 return NGX_ERROR; | |
| 362 } | |
| 363 | |
| 364 cl = ngx_alloc_chain_link(r->pool); | |
| 365 if (cl == NULL) { | |
| 366 return NGX_ERROR; | |
| 367 } | |
| 368 | |
| 369 slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module); | |
| 370 | |
| 371 if (ctx->sub.data == NULL) { | |
| 372 | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
373 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
|
374 != NGX_OK) |
| 1172 | 375 { |
| 376 return NGX_ERROR; | |
| 377 } | |
| 378 } | |
| 379 | |
|
1555
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
380 if (ctx->sub.len) { |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
381 b->memory = 1; |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
382 b->pos = ctx->sub.data; |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
383 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
|
384 |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
385 } else { |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
386 b->sync = 1; |
|
76fe59c6fafb
fix empty string replacement in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
1172
diff
changeset
|
387 } |
| 1172 | 388 |
| 389 cl->buf = b; | |
| 390 cl->next = NULL; | |
| 391 *ctx->last_out = cl; | |
| 392 ctx->last_out = &cl->next; | |
| 393 | |
| 394 ctx->once = slcf->once; | |
| 395 | |
| 396 continue; | |
| 397 } | |
| 398 | |
| 399 if (ctx->buf->last_buf || ngx_buf_in_memory(ctx->buf)) { | |
| 400 if (b == NULL) { | |
| 401 if (ctx->free) { | |
| 402 cl = ctx->free; | |
| 403 ctx->free = ctx->free->next; | |
| 404 b = cl->buf; | |
| 405 ngx_memzero(b, sizeof(ngx_buf_t)); | |
| 406 | |
| 407 } else { | |
| 408 b = ngx_calloc_buf(r->pool); | |
| 409 if (b == NULL) { | |
| 410 return NGX_ERROR; | |
| 411 } | |
| 412 | |
| 413 cl = ngx_alloc_chain_link(r->pool); | |
| 414 if (cl == NULL) { | |
| 415 return NGX_ERROR; | |
| 416 } | |
| 417 | |
| 418 cl->buf = b; | |
| 419 } | |
| 420 | |
| 421 b->sync = 1; | |
| 422 | |
| 423 cl->next = NULL; | |
| 424 *ctx->last_out = cl; | |
| 425 ctx->last_out = &cl->next; | |
| 426 } | |
| 427 | |
| 428 b->last_buf = ctx->buf->last_buf; | |
| 429 b->shadow = ctx->buf; | |
| 430 | |
| 431 b->recycled = ctx->buf->recycled; | |
| 432 } | |
| 433 | |
| 434 ctx->buf = NULL; | |
| 435 | |
|
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
436 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
|
437 ngx_memcpy(ctx->saved.data, ctx->looked.data, ctx->looked.len); |
| 1172 | 438 } |
| 439 | |
| 440 if (ctx->out == NULL && ctx->busy == NULL) { | |
| 441 return NGX_OK; | |
| 442 } | |
| 443 | |
| 444 return ngx_http_sub_output(r, ctx); | |
| 445 } | |
| 446 | |
| 447 | |
| 448 static ngx_int_t | |
| 449 ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx) | |
| 450 { | |
| 451 ngx_int_t rc; | |
| 452 ngx_buf_t *b; | |
| 453 ngx_chain_t *cl; | |
| 454 | |
| 455 #if 1 | |
| 456 b = NULL; | |
| 457 for (cl = ctx->out; cl; cl = cl->next) { | |
| 458 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 459 "sub out: %p %p", cl->buf, cl->buf->pos); | |
| 460 if (cl->buf == b) { | |
| 461 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, | |
| 462 "the same buf was used in sub"); | |
| 463 ngx_debug_point(); | |
| 464 return NGX_ERROR; | |
| 465 } | |
| 466 b = cl->buf; | |
| 467 } | |
| 468 #endif | |
| 469 | |
| 470 rc = ngx_http_next_body_filter(r, ctx->out); | |
| 471 | |
| 472 if (ctx->busy == NULL) { | |
| 473 ctx->busy = ctx->out; | |
| 474 | |
| 475 } else { | |
| 476 for (cl = ctx->busy; cl->next; cl = cl->next) { /* void */ } | |
| 477 cl->next = ctx->out; | |
| 478 } | |
| 479 | |
| 480 ctx->out = NULL; | |
| 481 ctx->last_out = &ctx->out; | |
| 482 | |
| 483 while (ctx->busy) { | |
| 484 | |
| 485 cl = ctx->busy; | |
| 486 b = cl->buf; | |
| 487 | |
| 488 if (ngx_buf_size(b) != 0) { | |
| 489 break; | |
| 490 } | |
| 491 | |
| 492 if (b->shadow) { | |
| 493 b->shadow->pos = b->shadow->last; | |
| 494 } | |
| 495 | |
| 496 ctx->busy = cl->next; | |
| 497 | |
| 498 if (ngx_buf_in_memory(b) || b->in_file) { | |
| 499 /* add data bufs only to the free buf chain */ | |
| 500 | |
| 501 cl->next = ctx->free; | |
| 502 ctx->free = cl; | |
| 503 } | |
| 504 } | |
| 505 | |
| 506 if (ctx->in || ctx->buf) { | |
| 507 r->buffered |= NGX_HTTP_SUB_BUFFERED; | |
| 508 | |
| 509 } else { | |
| 510 r->buffered &= ~NGX_HTTP_SUB_BUFFERED; | |
| 511 } | |
| 512 | |
| 513 return rc; | |
| 514 } | |
| 515 | |
| 516 | |
| 517 static ngx_int_t | |
| 518 ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx) | |
| 519 { | |
| 520 u_char *p, *last, *copy_end, ch, match; | |
| 521 size_t looked; | |
| 522 ngx_http_sub_state_e state; | |
| 523 | |
| 524 if (ctx->once) { | |
| 525 ctx->copy_start = ctx->pos; | |
| 526 ctx->copy_end = ctx->buf->last; | |
| 527 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
|
528 ctx->looked.len = 0; |
| 1172 | 529 |
| 530 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "once"); | |
| 531 | |
| 532 return NGX_AGAIN; | |
| 533 } | |
| 534 | |
| 535 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
|
536 looked = ctx->looked.len; |
| 1172 | 537 last = ctx->buf->last; |
| 538 copy_end = ctx->copy_end; | |
| 539 | |
| 540 for (p = ctx->pos; p < last; p++) { | |
| 541 | |
| 542 ch = *p; | |
| 543 ch = ngx_tolower(ch); | |
| 544 | |
| 545 if (state == sub_start_state) { | |
| 546 | |
| 547 /* the tight loop */ | |
| 548 | |
| 549 match = ctx->match.data[0]; | |
| 550 | |
| 551 for ( ;; ) { | |
| 552 if (ch == match) { | |
| 553 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
|
554 ctx->looked.data[0] = *p; |
| 1172 | 555 looked = 1; |
| 556 state = sub_match_state; | |
| 557 | |
| 558 goto match_started; | |
| 559 } | |
| 560 | |
| 561 if (++p == last) { | |
| 562 break; | |
| 563 } | |
| 564 | |
| 565 ch = *p; | |
| 566 ch = ngx_tolower(ch); | |
| 567 } | |
| 568 | |
|
1557
9d094e581587
*) add sub_filter parser fix similar to r1261 in SSI parser
Igor Sysoev <igor@sysoev.ru>
parents:
1555
diff
changeset
|
569 ctx->state = state; |
| 1172 | 570 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
|
571 ctx->looked.len = looked; |
| 1172 | 572 ctx->copy_end = p; |
| 573 | |
| 574 if (ctx->copy_start == NULL) { | |
| 575 ctx->copy_start = ctx->buf->pos; | |
| 576 } | |
| 577 | |
| 578 return NGX_AGAIN; | |
| 579 | |
| 580 match_started: | |
| 581 | |
| 582 continue; | |
| 583 } | |
| 584 | |
| 585 /* state == sub_match_state */ | |
| 586 | |
| 587 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
|
588 ctx->looked.data[looked] = *p; |
| 1172 | 589 looked++; |
| 590 | |
| 591 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
|
592 if ((size_t) (p - ctx->pos) < looked) { |
|
3675
08d7165b6be1
fix case of partially matched patterns on buffer border in sub_filter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
593 ctx->saved.len = 0; |
|
1557
9d094e581587
*) add sub_filter parser fix similar to r1261 in SSI parser
Igor Sysoev <igor@sysoev.ru>
parents:
1555
diff
changeset
|
594 } |
|
9d094e581587
*) add sub_filter parser fix similar to r1261 in SSI parser
Igor Sysoev <igor@sysoev.ru>
parents:
1555
diff
changeset
|
595 |
| 1172 | 596 ctx->state = sub_start_state; |
| 597 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
|
598 ctx->looked.len = 0; |
| 1172 | 599 ctx->copy_end = copy_end; |
| 600 | |
| 601 if (ctx->copy_start == NULL && copy_end) { | |
| 602 ctx->copy_start = ctx->buf->pos; | |
| 603 } | |
| 604 | |
| 605 return NGX_OK; | |
| 606 } | |
| 607 | |
| 608 } else if (ch == ctx->match.data[0]) { | |
| 609 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
|
610 ctx->looked.data[0] = *p; |
| 1172 | 611 looked = 1; |
| 612 | |
| 613 } else { | |
| 614 copy_end = p; | |
| 615 looked = 0; | |
| 616 state = sub_start_state; | |
| 617 } | |
| 618 } | |
| 619 | |
| 620 ctx->state = state; | |
| 621 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
|
622 ctx->looked.len = looked; |
| 1172 | 623 |
| 624 ctx->copy_end = (state == sub_start_state) ? p : copy_end; | |
| 625 | |
| 626 if (ctx->copy_start == NULL && ctx->copy_end) { | |
| 627 ctx->copy_start = ctx->buf->pos; | |
| 628 } | |
| 629 | |
| 630 return NGX_AGAIN; | |
| 631 } | |
| 632 | |
| 633 | |
| 634 static char * | |
| 635 ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 636 { | |
| 637 ngx_http_sub_loc_conf_t *slcf = conf; | |
| 638 | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
639 ngx_str_t *value; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
640 ngx_http_compile_complex_value_t ccv; |
| 1172 | 641 |
|
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4746
diff
changeset
|
642 if (slcf->match.data) { |
| 1172 | 643 return "is duplicate"; |
| 644 } | |
| 645 | |
| 646 value = cf->args->elts; | |
| 647 | |
| 2135 | 648 ngx_strlow(value[1].data, value[1].data, value[1].len); |
| 1172 | 649 |
| 2135 | 650 slcf->match = value[1]; |
| 1172 | 651 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
652 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
| 1172 | 653 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
654 ccv.cf = cf; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
655 ccv.value = &value[2]; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
656 ccv.complex_value = &slcf->value; |
| 1172 | 657 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
658 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
| 1172 | 659 return NGX_CONF_ERROR; |
| 660 } | |
| 661 | |
| 662 return NGX_CONF_OK; | |
| 663 } | |
| 664 | |
| 665 | |
| 666 static void * | |
| 667 ngx_http_sub_create_conf(ngx_conf_t *cf) | |
| 668 { | |
| 669 ngx_http_sub_loc_conf_t *slcf; | |
| 670 | |
| 671 slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_sub_loc_conf_t)); | |
| 672 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
|
673 return NULL; |
| 1172 | 674 } |
| 675 | |
| 676 /* | |
| 677 * set by ngx_pcalloc(): | |
| 678 * | |
|
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
679 * 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
|
680 * conf->sub = { 0, NULL }; |
| 1172 | 681 * conf->sub_lengths = NULL; |
| 682 * conf->sub_values = NULL; | |
|
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
683 * conf->types = { NULL }; |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
684 * conf->types_keys = NULL; |
| 1172 | 685 */ |
| 686 | |
| 687 slcf->once = NGX_CONF_UNSET; | |
|
5229
4c1a604b0285
Sub filter: sub_filter_last_modified directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4947
diff
changeset
|
688 slcf->last_modified = NGX_CONF_UNSET; |
| 1172 | 689 |
| 690 return slcf; | |
| 691 } | |
| 692 | |
| 693 | |
| 694 static char * | |
| 695 ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 696 { | |
| 697 ngx_http_sub_loc_conf_t *prev = parent; | |
| 698 ngx_http_sub_loc_conf_t *conf = child; | |
| 699 | |
| 700 ngx_conf_merge_value(conf->once, prev->once, 1); | |
| 701 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
|
702 ngx_conf_merge_value(conf->last_modified, prev->last_modified, 0); |
| 1172 | 703 |
|
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4746
diff
changeset
|
704 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
|
705 conf->value = prev->value; |
| 1172 | 706 } |
| 707 | |
|
3372
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
708 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
|
709 &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
|
710 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
|
711 != NGX_OK) |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
712 { |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
713 return NGX_CONF_ERROR; |
| 1172 | 714 } |
| 715 | |
| 716 return NGX_CONF_OK; | |
| 717 } | |
| 718 | |
| 719 | |
| 720 static ngx_int_t | |
| 721 ngx_http_sub_filter_init(ngx_conf_t *cf) | |
| 722 { | |
| 723 ngx_http_next_header_filter = ngx_http_top_header_filter; | |
| 724 ngx_http_top_header_filter = ngx_http_sub_header_filter; | |
| 725 | |
| 726 ngx_http_next_body_filter = ngx_http_top_body_filter; | |
| 727 ngx_http_top_body_filter = ngx_http_sub_body_filter; | |
| 728 | |
| 729 return NGX_OK; | |
| 730 } |