worked around a bug in ngx_http_subrequest regarding r->headers_in inheritance.

agentzh · agentzh · commit 064dd0c4003c · 2011-01-26T13:04:38.000+08:00
diff --git a/src/ngx_http_srcache_util.c b/src/ngx_http_srcache_util.c
@@ -155,14 +155,24 @@ ngx_http_srcache_adjust_subrequest(ngx_http_request_t *sr,
 {
     ngx_table_elt_t            *h;
     ngx_http_core_main_conf_t  *cmcf;
+    ngx_http_request_t         *r;
 
     sr->method      = parsed_sr->method;
     sr->method_name = parsed_sr->method_name;
 
+    r = sr->parent;
+
     dd("subrequest method: %d %.*s", (int) sr->method,
             (int) sr->method_name.len, sr->method_name.data);
 
-    sr->header_in = sr->parent->header_in;
+    sr->header_in = r->header_in;
+
+#if 1
+    /* XXX work-around a bug in ngx_http_subrequest */
+    if (r->headers_in.headers.last == &r->headers_in.headers.part) {
+        sr->headers_in.headers.last = &sr->headers_in.headers.part;
+    }
+#endif
 
     /* we do not inherit the parent request's variables */
     cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
