diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 14:51:31 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 14:51:31 +0000 |
commit | cdc463042b9406e4703d21202bc363e86321bb5d (patch) | |
tree | 1f6d050377dafbf42bb3d7c8c7e15e86939500ff /src/http/modules/ngx_http_static_module.c | |
parent | c20f0c28ff5478dcafd2ce2e5056da3757eb62ff (diff) | |
download | nginx-cdc463042b9406e4703d21202bc363e86321bb5d.tar.gz nginx-cdc463042b9406e4703d21202bc363e86321bb5d.zip |
nginx-0.3.15-RELEASE importrelease-0.3.15
*) Feature: the new 444 code of the "return" directive to close
connection.
*) Feature: the "so_keepalive" directive in IMAP/POP3 proxy.
*) Bugfix: if there are unclosed connection nginx now calls abort()
only on gracefull quit and active "debug_points" directive.
Diffstat (limited to 'src/http/modules/ngx_http_static_module.c')
-rw-r--r-- | src/http/modules/ngx_http_static_module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c index e9d2b395d..ed360faec 100644 --- a/src/http/modules/ngx_http_static_module.c +++ b/src/http/modules/ngx_http_static_module.c @@ -244,12 +244,12 @@ ngx_http_static_handler(ngx_http_request_t *r) return NGX_HTTP_INTERNAL_SERVER_ERROR; } - r->allow_ranges = 1; - - if (r->header_only || (r->main != r && ngx_file_size(&fi) == 0)) { + if (r->main != r && ngx_file_size(&fi) == 0) { return ngx_http_send_header(r); } + r->allow_ranges = 1; + /* we need to allocate all before the header would be sent */ b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); |