diff options
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/modules/ngx_http_static_handler.c | 24 | ||||
| -rw-r--r-- | src/http/ngx_http_write_filter.c | 10 |
2 files changed, 19 insertions, 15 deletions
diff --git a/src/http/modules/ngx_http_static_handler.c b/src/http/modules/ngx_http_static_handler.c index 9a1a814ef..cf942ad24 100644 --- a/src/http/modules/ngx_http_static_handler.c +++ b/src/http/modules/ngx_http_static_handler.c @@ -483,22 +483,32 @@ static ngx_int_t ngx_http_static_handler(ngx_http_request_t *r) r->headers_out.content_length_n = ngx_file_size(&fi); r->headers_out.last_modified_time = ngx_file_mtime(&fi); + if (r->headers_out.content_length_n == 0) { + r->header_only = 1; + } + if (ngx_http_set_content_type(r) != NGX_OK) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } +#if (NGX_SUPPRESS_WARN) + b = NULL; +#endif - /* we need to allocate all before the header would be sent */ + if (!r->header_only) { + /* we need to allocate all before the header would be sent */ - if (!(b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)))) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } + if (!(b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)))) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } - if (!(b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t)))) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; + if (!(b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t)))) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + + r->filter_allow_ranges = 1; } - r->filter_allow_ranges = 1; rc = ngx_http_send_header(r); if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { diff --git a/src/http/ngx_http_write_filter.c b/src/http/ngx_http_write_filter.c index c6cc6519a..2c0989d0a 100644 --- a/src/http/ngx_http_write_filter.c +++ b/src/http/ngx_http_write_filter.c @@ -40,7 +40,7 @@ ngx_module_t ngx_http_write_filter_module = { ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) { int last; - off_t size, flush, sent, bsize; + off_t size, flush, sent; ngx_chain_t *cl, *ln, **ll, *chain; ngx_connection_t *c; ngx_http_core_loc_conf_t *clcf; @@ -82,13 +82,7 @@ ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) *ll = cl; ll = &cl->next; - bsize = ngx_buf_size(cl->buf); - - if (bsize == 0 && cl->buf->in_file) { - cl->buf->in_file = 0; - } - - size += bsize; + size += ngx_buf_size(cl->buf); if (cl->buf->flush || cl->buf->recycled) { flush = size; |