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