nginx-0.0.3-2004-05-14-20:51:47 import

2 files changed, 3 insertions, 15 deletions

diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index b7b5abf96..76b07bfb5 100644
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -18,7 +18,7 @@ typedef struct {
     int                  level;
     size_t               wbits;
     size_t               memlevel;
-    size_t               min_length;
+    ssize_t              min_length;
 } ngx_http_gzip_conf_t;
 
 
@@ -913,7 +913,7 @@ static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf,
     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_size_value(conf->min_length, prev->min_length, 0);
+    ngx_conf_merge_value(conf->min_length, prev->min_length, 0);
     ngx_conf_merge_value(conf->no_buffer, prev->no_buffer, 0);
 
     return NGX_CONF_OK;
diff --git a/src/http/modules/ngx_http_range_filter.c b/src/http/modules/ngx_http_range_filter.c
index d63f4c8d5..ecb42ad3d 100644
--- a/src/http/modules/ngx_http_range_filter.c
+++ b/src/http/modules/ngx_http_range_filter.c
@@ -114,17 +114,6 @@ static ngx_int_t ngx_http_range_header_filter(ngx_http_request_t *r)
         || r->headers_out.status != NGX_HTTP_OK
         || r->headers_out.content_length_n == -1
         || !(r->filter & NGX_HTTP_FILTER_ALLOW_RANGES))
-
-#if 0
-        /* STUB: we currently support ranges for file hunks only */
-        || !r->sendfile
-        || r->filter & NGX_HTTP_FILTER_NEED_IN_MEMORY
-#endif
-
-#if 0
-        || (r->headers_out.content_encoding
-            && r->headers_out.content_encoding->value.len))
-#endif
     {
         return ngx_http_next_header_filter(r);
     }
@@ -506,8 +495,7 @@ static ngx_int_t ngx_http_range_body_filter(ngx_http_request_t *r,
         return ngx_http_next_body_filter(r, out);
     }
 
-    /* TODO: several incoming hunks of proxied responses
-             and memory hunks on platforms that have no sendfile() */
+    /* TODO: alert */
 
     return ngx_http_next_body_filter(r, in);
 }