[master] ab9af46 Don't expect the surplus new-line just removed in cache_acceptor

Poul-Henning Kamp phk at FreeBSD.org
Tue Mar 10 10:02:48 CET 2015


commit ab9af460bc2436e1bf9b9fd0bbdfcf2dc6885f4c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Mar 10 08:49:46 2015 +0000

    Don't expect the surplus new-line just removed in cache_acceptor

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 0473002..ca1ab0a 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -504,7 +504,7 @@ static void
 varnish_start(struct varnish *v)
 {
 	enum VCLI_status_e u;
-	char *resp, *h, *p, *q;
+	char *resp, *h, *p;
 
 	if (v->cli_fd < 0)
 		varnish_launch(v);
@@ -535,9 +535,6 @@ varnish_start(struct varnish *v)
 	p = strchr(h, ' ');
 	AN(p);
 	*p++ = '\0';
-	q = strchr(p, '\n');
-	AN(q);
-	*q = '\0';
 	vtc_log(v->vl, 2, "Listen on %s %s", h, p);
 	macro_def(v->vl, v->name, "addr", "%s", h);
 	macro_def(v->vl, v->name, "port", "%s", p);



More information about the varnish-commit mailing list