Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx-0.0.3-2004-04-16-19:27:31 import

Browse source
This commit is contained in:
Igor Sysoev 2004-04-16 15:27:31 +00:00
parent f0d8d4ab5d
commit fe7821872c
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/http/modules/ngx_http_gzip_filter.c
View file

@ -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;

2
src/http/ngx_http_write_filter.c
View file

@ -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;
}

3
src/os/unix/ngx_aio_read_chain.c
View file

@ -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) {