diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-04-16 15:27:31 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-16 15:27:31 +0000 |
| commit | 32075f53e94183c647da58d4d832a58725d36c49 (patch) | |
| tree | 7951913c6b91189bcd7d152e625469968fa07ccb /src | |
| parent | 630ad0c7b17b4e20d978706d3884995481f28b3c (diff) | |
| download | nginx-32075f53e94183c647da58d4d832a58725d36c49.tar.gz nginx-32075f53e94183c647da58d4d832a58725d36c49.zip | |
nginx-0.0.3-2004-04-16-19:27:31 import
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_gzip_filter.c | 9 | ||||
| -rw-r--r-- | src/http/ngx_http_write_filter.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_aio_read_chain.c | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c index 2034595d0..8c22ac629 100644 --- a/src/http/modules/ngx_http_gzip_filter.c +++ b/src/http/modules/ngx_http_gzip_filter.c @@ -16,8 +16,8 @@ typedef struct { 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 @@ static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf, 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; diff --git a/src/http/ngx_http_write_filter.c b/src/http/ngx_http_write_filter.c index 5fa144fbc..8c1a98a91 100644 --- a/src/http/ngx_http_write_filter.c +++ b/src/http/ngx_http_write_filter.c @@ -133,7 +133,7 @@ int ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) * 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; } diff --git a/src/os/unix/ngx_aio_read_chain.c b/src/os/unix/ngx_aio_read_chain.c index 3a56e8613..2858afa5b 100644 --- a/src/os/unix/ngx_aio_read_chain.c +++ b/src/os/unix/ngx_aio_read_chain.c @@ -9,7 +9,8 @@ ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl) { int n; u_char *buf, *prev; - size_t size, total; + size_t size; + ssize_t total; ngx_err_t err; if (c->read->aio_eof) { |