comparison src/http/ngx_http_output_filter.c @ 119:cd54bcbaf3b5

nginx-0.0.1-2003-07-21-01:15:59 import
author Igor Sysoev <igor@sysoev.ru>
date Sun, 20 Jul 2003 21:15:59 +0000
parents 571bcbff82c5
children e29909bd9b8a
comparison
equal deleted inserted replaced
118:5bf52498665c 119:cd54bcbaf3b5
16 ngx_chain_t out; /* one chain entry for output */ 16 ngx_chain_t out; /* one chain entry for output */
17 } ngx_http_output_filter_ctx_t; 17 } ngx_http_output_filter_ctx_t;
18 18
19 19
20 static int ngx_http_output_filter_copy_hunk(ngx_hunk_t *dst, ngx_hunk_t *src); 20 static int ngx_http_output_filter_copy_hunk(ngx_hunk_t *dst, ngx_hunk_t *src);
21 static void *ngx_http_output_filter_create_conf(ngx_pool_t *pool); 21 static void *ngx_http_output_filter_create_conf(ngx_conf_t *cf);
22 static char *ngx_http_output_filter_merge_conf(ngx_pool_t *pool, 22 static char *ngx_http_output_filter_merge_conf(ngx_conf_t *cf,
23 void *parent, void *child); 23 void *parent, void *child);
24 24
25 25
26 static ngx_command_t ngx_http_output_filter_commands[] = { 26 static ngx_command_t ngx_http_output_filter_commands[] = {
27 27
305 305
306 return NGX_OK; 306 return NGX_OK;
307 } 307 }
308 308
309 309
310 static void *ngx_http_output_filter_create_conf(ngx_pool_t *pool) 310 static void *ngx_http_output_filter_create_conf(ngx_conf_t *cf)
311 { 311 {
312 ngx_http_output_filter_conf_t *conf; 312 ngx_http_output_filter_conf_t *conf;
313 313
314 ngx_test_null(conf, 314 ngx_test_null(conf,
315 ngx_palloc(pool, sizeof(ngx_http_output_filter_conf_t)), 315 ngx_palloc(cf->pool, sizeof(ngx_http_output_filter_conf_t)),
316 NULL); 316 NULL);
317 317
318 conf->hunk_size = NGX_CONF_UNSET; 318 conf->hunk_size = NGX_CONF_UNSET;
319 319
320 return conf; 320 return conf;
321 } 321 }
322 322
323 323
324 static char *ngx_http_output_filter_merge_conf(ngx_pool_t *pool, 324 static char *ngx_http_output_filter_merge_conf(ngx_conf_t *cf,
325 void *parent, void *child) 325 void *parent, void *child)
326 { 326 {
327 ngx_http_output_filter_conf_t *prev = parent; 327 ngx_http_output_filter_conf_t *prev = parent;
328 ngx_http_output_filter_conf_t *conf = child; 328 ngx_http_output_filter_conf_t *conf = child;
329 329