nginx-0.0.11-2004-09-20-19:17:02 import

diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 19808a1e27d9166f566309fdfc567669a7627dd3..9ab04310cc516d097980c3f9e1cac061d962c93b 100644 (file)
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -129,7 +129,6 @@ void ngx_event_accept(ngx_event_t *ev)
 
 #if (NGX_STAT_STUB)
         (*ngx_stat_accepted)++;
-        (*ngx_stat_active)++;
 #endif
 
         ngx_accept_disabled = (ngx_uint_t) s + NGX_ACCEPT_THRESHOLD
@@ -150,6 +149,10 @@ void ngx_event_accept(ngx_event_t *ev)
             return;
         }
 
+#if (NGX_STAT_STUB)
+        (*ngx_stat_active)++;
+#endif
+
         /* set a blocking mode for aio and non-blocking mode for the others */
 
         if (ngx_inherited_nonblocking) {

diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index edc643af12ad51ca0d8f7fa7737693dc9236b42a..dc101b7fc2489adb4831d14774742a438a963073 100644 (file)
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -440,9 +440,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
          * Besides we free this memory as soon as the gzipping will complete
          * and do not wait while a whole response will be sent to a client.
          *
-         * 8K is for zlib deflate_state (~6K).
-         *
-         * TODO: 64-bit, autoconf of deflate_state size
+         * 8K is for zlib deflate_state.  It takes 5816 bytes on x86
+         * and 5920 bytes on amd64.
          */
 
         ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
@@ -804,8 +803,9 @@ static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
     if (alloc % 512 != 0) {
 
         /*
-         * allocate the zlib deflate_state, it takes about 6K on x86,
-         * we allocate 8K
+         * The zlib deflate_state allocation, it takes 5816 bytes on x86
+         * and 5920 bytes on amd64.
+         * We allocate 8K.
          */
 
         alloc = (alloc + ngx_pagesize - 1) & ~(ngx_pagesize - 1);