diff src/http/modules/ngx_http_gzip_filter.c @ 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 39b6f2df45c0
children d621239c30f7
line wrap: on
line diff
--- 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(ng
                                   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;