nginx-0.0.2-2004-02-20-19:48:59 import

src/http/modules/ngx_http_gzip_filter.c

diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index 34d872c..9cf377e 100644
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -10,8 +10,8 @@
     int                  enable;
     ngx_bufs_t           bufs;
     int                  level;
-    int                  wbits;
-    int                  memlevel;
+    ssize_t              wbits;
+    ssize_t              memlevel;
     int                  no_buffer;
 } ngx_http_gzip_conf_t;
 
@@ -667,8 +667,9 @@
     ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 4,
                               /* STUB: PAGE_SIZE */ 4096);
     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;

src/http/modules/proxy/ngx_http_proxy_handler.h

diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.h b/src/http/modules/proxy/ngx_http_proxy_handler.h
index 43eb5ef..62d0548 100644
--- a/src/http/modules/proxy/ngx_http_proxy_handler.h
+++ b/src/http/modules/proxy/ngx_http_proxy_handler.h
@@ -65,7 +65,7 @@
 
     int                              ignore_expires;
     int                              lm_factor;
-    int                              default_expires;
+    time_t                           default_expires;
 
     int                              next_upstream;
     int                              use_stale;

src/http/ngx_http_file_cache.c

diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 038056f..10cb3ed 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -4,7 +4,11 @@
 #include <ngx_http.h>
 
 
+#if (HAVE_OPENSSL_MD5_H)
+#include <openssl/md5.h>
+#else
 #include <md5.h>
+#endif
 
 #if (HAVE_OPENSSL_MD5)
 #define  MD5Init    MD5_Init