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

diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index 2034595d0d32900ffe11a95ad651eb6265f216d0..8c22ac629e8fc0b4bec1f29d33a49b8987f6310a 100644 (file)
--- 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 5fa144fbcd6cbd24e5847e0318170fe16ed838bd..8c1a98a91f2523cb6df271a93ef30d1cf7148225 100644 (file)
--- 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 3a56e861361f0933f5acfee3a032b1ce47dfcc03..2858afa5b0bfebd3d3870221cfaccf77f7edf389 100644 (file)
--- 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) {