Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Headers cleared with cache enabled (If-Modified-Since etc.) might be cleared in unrelated servers/locations without proxy_cache enabled if proxy_cache was used in some server/location. Example config which triggered the problem: proxy_set_header X-Test "test"; server { location /1 { proxy_cache name; proxy_pass ... } } server { location /2 { proxy_pass ... } } Another one: server { proxy_cache name; location /1 { proxy_pass ... } location /2 { proxy_cache off; proxy_pass ... } } In both cases If-Modified-Since header wasn't sent to backend in location /2. Fix is to not modify conf->headers_source, but instead merge user-supplied headers from conf->headers_source and default headers (either cache or not) into separate headers_merged array.

X:stylesheet {

X:output method="xml"
X:param indent-increment="'   '";

X:template noname(indent="'
'") = "*" {
	!{$indent}

	X:if "name()='xsl:template'" {
		!{$indent}
	}

	X:copy {
	   X:copy-of "@*"
     	   !!( indent = "concat($indent, $indent-increment)" );
	   X:if "./* " { !{$indent}  }
	}
}

 
X:template = "comment()|processing-instruction()" {
    X:copy;
}

<!--
X:template ="text()[normalize-space(.)='']" {}
-->

}