Mercurial > hg > nginx
diff 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 |
line wrap: on
line diff
--- a/src/http/ngx_http_output_filter.c +++ b/src/http/ngx_http_output_filter.c @@ -18,8 +18,8 @@ typedef struct { static int ngx_http_output_filter_copy_hunk(ngx_hunk_t *dst, ngx_hunk_t *src); -static void *ngx_http_output_filter_create_conf(ngx_pool_t *pool); -static char *ngx_http_output_filter_merge_conf(ngx_pool_t *pool, +static void *ngx_http_output_filter_create_conf(ngx_conf_t *cf); +static char *ngx_http_output_filter_merge_conf(ngx_conf_t *cf, void *parent, void *child); @@ -307,12 +307,12 @@ ngx_log_debug(src->file->log, "READ: %qd } -static void *ngx_http_output_filter_create_conf(ngx_pool_t *pool) +static void *ngx_http_output_filter_create_conf(ngx_conf_t *cf) { ngx_http_output_filter_conf_t *conf; ngx_test_null(conf, - ngx_palloc(pool, sizeof(ngx_http_output_filter_conf_t)), + ngx_palloc(cf->pool, sizeof(ngx_http_output_filter_conf_t)), NULL); conf->hunk_size = NGX_CONF_UNSET; @@ -321,7 +321,7 @@ static void *ngx_http_output_filter_crea } -static char *ngx_http_output_filter_merge_conf(ngx_pool_t *pool, +static char *ngx_http_output_filter_merge_conf(ngx_conf_t *cf, void *parent, void *child) { ngx_http_output_filter_conf_t *prev = parent;