bugfix: HEAD requests might result in response bodies.

agentzh · agentzh · commit 74a9e042a556 · 2014-03-17T16:33:49.000-07:00
diff --git a/src/ngx_http_srcache_store.c b/src/ngx_http_srcache_store.c
@@ -92,19 +92,25 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
             /* pr_ctx->fetch_error = 1; */
             r->header_sent = 1;
 
+            if (r->method == NGX_HTTP_HEAD) {
+                r->header_only = 1;
+            }
+
             return NGX_OK;
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "srcache_fetch decides to send the response in cache");
 
         r->filter_need_in_memory = 1;
-
         pr_ctx->from_cache = 1;
-
         ctx->parsing_cached_headers = 1;
-
         r->header_sent = 1;
+
+        if (r->method == NGX_HTTP_HEAD) {
+            r->header_only = 1;
+        }
+
         return NGX_OK;
     }
 
@@ -117,6 +123,11 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
                        r->headers_out.status);
 
         r->header_sent = 1;
+
+        if (r->method == NGX_HTTP_HEAD) {
+            r->header_only = 1;
+        }
+
         return NGX_OK;
     }
 
@@ -244,6 +255,10 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
     ctx->http_status = r->headers_out.status;
     ctx->store_response = 1;
 
+    if (r->method == NGX_HTTP_HEAD) {
+        r->header_only = 1;
+    }
+
     return NGX_OK;
 }
 
