Mercurial > hg > nginx

comparison src/http/ngx_http_write_filter.c @ 59:e8cdc2989cee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-02-06-20:21:13 import
author Igor Sysoev <igor@sysoev.ru>
date Thu, 06 Feb 2003 17:21:13 +0000
parents 27b628ef907e
children 4f3e2abcc2c4
comparison
equal deleted inserted replaced
58:6b13b1cadabe 59:e8cdc2989cee
169 ngx_http_write_filter_conf_t *prev = 169 ngx_http_write_filter_conf_t *prev =
170 (ngx_http_write_filter_conf_t *) parent; 170 (ngx_http_write_filter_conf_t *) parent;
171 ngx_http_write_filter_conf_t *conf = 171 ngx_http_write_filter_conf_t *conf =
172 (ngx_http_write_filter_conf_t *) child; 172 (ngx_http_write_filter_conf_t *) child;
173 173
174 ngx_conf_merge(conf->buffer_output, prev->buffer_output, 1460); 174 ngx_conf_size_merge(conf->buffer_output, prev->buffer_output, 1460);
175 175
176 return NULL; 176 return NULL;
177 } 177 }
178 178