[4.0] 6b2cc80 Skip headers on errors.

Lasse Karstensen lkarsten at varnish-software.com
Mon Oct 19 17:48:39 CEST 2015


commit 6b2cc8091125bd505a3762cda338c3593bd3e720
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Mon Oct 19 17:44:10 2015 +0200

    Skip headers on errors.
    
    This didn't make any sense and should never have been commited.

diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 24e4444..982af71 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -806,7 +806,7 @@ http_Merge(const struct http *fm, struct http *to, int not_ce)
 	for (v = HTTP_HDR_FIRST; v < to->nhd; v++) {
 		p = strchr(to->hd[v].b, ':');
 		if (!p)
-			p = 0;
+			continue;
 		u = http_findhdr(fm, p - to->hd[v].b, to->hd[v].b);
 		if (u)
 			fm->hdf[u] &= ~HDF_MARKER;



More information about the varnish-commit mailing list