Merge of r4991: fixed proxied HEAD requests with gzip enabled.

Fixed HEAD requests handling when proxying is used (ticket #261).
This commit is contained in:
Maxim Dounin 2013-02-11 14:39:49 +00:00
parent 7cc223cc54
commit 0a74b1021d
2 changed files with 2 additions and 1 deletions

View File

@ -320,7 +320,7 @@ ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ctx = ngx_http_get_module_ctx(r, ngx_http_gzip_filter_module);
if (ctx == NULL || ctx->done) {
if (ctx == NULL || ctx->done || r->header_only) {
return ngx_http_next_body_filter(r, in);
}

View File

@ -3099,6 +3099,7 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
r->connection->log->action = "sending to client";
if (rc == 0
&& !r->header_only
#if (NGX_HTTP_CACHE)
&& !r->cached
#endif