Mercurial > hg > nginx
changeset 319:7a8ebba985a9
nginx-0.0.3-2004-04-16-19:27:31 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 16 Apr 2004 15:27:31 +0000 |
parents | 56496082668b |
children | d621239c30f7 |
files | src/http/modules/ngx_http_gzip_filter.c src/http/ngx_http_write_filter.c src/os/unix/ngx_aio_read_chain.c |
diffstat | 3 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_gzip_filter.c Fri Apr 16 05:14:16 2004 +0000 +++ b/src/http/modules/ngx_http_gzip_filter.c Fri Apr 16 15:27:31 2004 +0000 @@ -16,8 +16,8 @@ ngx_uint_t proxied; int level; - int wbits; - int memlevel; + size_t wbits; + size_t memlevel; } ngx_http_gzip_conf_t; @@ -803,8 +803,9 @@ NGX_HTTP_GZIP_PROXIED_OFF); ngx_conf_merge_value(conf->level, prev->level, 1); - ngx_conf_merge_value(conf->wbits, prev->wbits, MAX_WBITS); - ngx_conf_merge_value(conf->memlevel, prev->memlevel, MAX_MEM_LEVEL - 1); + ngx_conf_merge_size_value(conf->wbits, prev->wbits, MAX_WBITS); + ngx_conf_merge_size_value(conf->memlevel, prev->memlevel, + MAX_MEM_LEVEL - 1); ngx_conf_merge_value(conf->no_buffer, prev->no_buffer, 0); return NGX_CONF_OK;
--- a/src/http/ngx_http_write_filter.c Fri Apr 16 05:14:16 2004 +0000 +++ b/src/http/ngx_http_write_filter.c Fri Apr 16 15:27:31 2004 +0000 @@ -133,7 +133,7 @@ * the size of the hunks is smaller than "postpone_output" directive */ - if (!last && flush == 0 && size < conf->postpone_output) { + if (!last && flush == 0 && size < (off_t) conf->postpone_output) { return NGX_OK; }