Merge branch '3.0' of ssh://git.varnish-cache.org/git/varnish-cache into 3.0

bin/varnishd/cache_esi_parse.c

@@ -201,7 +201,6 @@ vep_warn(const struct vep_state *vep, const char *p)
 
 	VSC_C_main->esi_warnings++;
 	l = (intmax_t)(vep->ver_p - vep->hack_p);
-	printf("WARNING at %jd %s\n", l, p);
 	WSP(vep->sp, SLT_ESI_xmlerror, "WARN at %jd %s", l, p);
 
 }

bin/varnishd/cache_fetch.c

@@ -498,7 +498,7 @@ FetchHdr(struct sess *sp)
 		i = HTC_Rx(w->htc);
 		if (i < 0) {
 			WSP(sp, SLT_FetchError,
-			    "http first read error: %d %d (%s)",
+			    "http read error: %d %d (%s)",
 			    i, errno, strerror(errno));
 			VDI_CloseFd(sp);
 			/* XXX: other cleanup ? */