diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2012-12-24 17:32:53 +0000 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2012-12-24 17:32:53 +0000 |
| commit | cb90df084f417f0aa2d9adc96124b22c655cf67b (patch) | |
| tree | 88f5072296bc9d0d92fb33e06575fd5157f7696f /src | |
| parent | 2189c87aa7fd8dc5694972f9693e52e585e70bb1 (diff) | |
| download | nginx-cb90df084f417f0aa2d9adc96124b22c655cf67b.tar.gz nginx-cb90df084f417f0aa2d9adc96124b22c655cf67b.zip | |
Fixed HEAD requests handling when proxying is used (closes #261).
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_gzip_filter_module.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c index 470be3daf..2f39543af 100644 --- a/src/http/modules/ngx_http_gzip_filter_module.c +++ b/src/http/modules/ngx_http_gzip_filter_module.c @@ -321,7 +321,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); } diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 5e04324d7..3436c6b1d 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -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 |