[nginx] svn commit: r5055 - in branches/stable-1.2: . src/http src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-11 14:39:49 +0000 (Mon, 11 Feb 2013)
New Revision: 5055
URL: http://trac.nginx.org/nginx/changeset/5055/nginx

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

Fixed HEAD requests handling when proxying is used (ticket #261).


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_gzip_filter_module.c
   branches/stable-1.2/src/http/ngx_http_upstream.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-02-11 14:34:00 UTC (rev 5054)
+++ branches/stable-1.2	2013-02-11 14:39:49 UTC (rev 5055)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4990,4993-4994,4997,5000,5002,5011
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4991,4993-4994,4997,5000,5002,5011
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_gzip_filter_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_gzip_filter_module.c	2013-02-11 14:34:00 UTC (rev 5054)
+++ branches/stable-1.2/src/http/modules/ngx_http_gzip_filter_module.c	2013-02-11 14:39:49 UTC (rev 5055)
@@ -320,7 +320,7 @@
 
     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);
     }
 

Modified: branches/stable-1.2/src/http/ngx_http_upstream.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_upstream.c	2013-02-11 14:34:00 UTC (rev 5054)
+++ branches/stable-1.2/src/http/ngx_http_upstream.c	2013-02-11 14:39:49 UTC (rev 5055)
@@ -3099,6 +3099,7 @@
     r->connection->log->action = "sending to client";
 
     if (rc == 0
+        && !r->header_only
 #if (NGX_HTTP_CACHE)
         && !r->cached
 #endif