nginx-0.0.2-2004-03-15-18:26:11 import

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 5515b906e4f9841bba96f4b078c3d156bbda5500..d4dedbc867346c1e7351cd1fb599928f26e5da86 100644 (file)
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -100,16 +100,7 @@ ngx_atomic_t  ngx_connection_counter;
 ngx_int_t     ngx_process;
 ngx_pid_t     ngx_pid;
 ngx_pid_t     ngx_new_binary;
-
 ngx_int_t     ngx_inherited;
-ngx_int_t     ngx_reap;
-ngx_int_t     ngx_timer;
-ngx_int_t     ngx_terminate;
-ngx_int_t     ngx_quit;
-ngx_int_t     ngx_noaccept;
-ngx_int_t     ngx_reconfigure;
-ngx_int_t     ngx_reopen;
-ngx_int_t     ngx_change_binary;
 
 
 int main(int argc, char *const *argv)

diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index b68ca31b55a06538a555f1191e61a2bec1532aed..18ad074fce58a3e8a45f29e4c03006a2d5d1514d 100644 (file)
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -561,7 +561,7 @@ static void ngx_http_gzip_filter_free(void *opaque, void *address)
 static char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, char *buf,
                                      uintptr_t data)
 {
-    int                   zint, zfrac;
+    u_int                 zint, zfrac;
     ngx_http_gzip_ctx_t  *ctx;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_gzip_filter_module);