[5.1] e1e7e76 Putter around with a featherduster:

[Poul-Henning Kamp]

commit e1e7e764bd8c53900a204551c8123971b778e85f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Apr 6 19:45:06 2017 +0000

    Putter around with a featherduster:
    
    Remove forgotten debugging VSL.  Renovate a VCL comment.

diff --git a/bin/varnishd/builtin.vcl b/bin/varnishd/builtin.vcl
index 14c7955..4e74948 100644
--- a/bin/varnishd/builtin.vcl
+++ b/bin/varnishd/builtin.vcl
@@ -36,7 +36,7 @@ vcl 4.0;
 
 sub vcl_recv {
     if (req.method == "PRI") {
-	/* We do not support SPDY or HTTP/2.0 */
+	/* This will never happen in properly formed traffic (see: RFC7540) */
 	return (synth(405));
     }
     if (req.method != "GET" &&
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index 3f19bdf..e6a6845 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -99,8 +99,6 @@ V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
 		}
 	}
 
-	VSLb(req->vsl, SLT_Debug, "RES_MODE %x", req->res_mode);
-
 	if (!req->doclose && http_HdrIs(req->resp, H_Connection, "close")) {
 		req->doclose = SC_RESP_CLOSE;
 	} else if (req->doclose) {
diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c
index f9463ef..a9d4ad5 100644
--- a/bin/varnishd/http2/cache_http2_deliver.c
+++ b/bin/varnishd/http2/cache_http2_deliver.c
@@ -193,8 +193,6 @@ h2_deliver(struct req *req, struct boc *boc, int sendbody)
 	sp = req->sp;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 
-	VSLb(req->vsl, SLT_Debug, "H2: Deliver");
-
 	(void)WS_Reserve(req->ws, 0);
 	p = (void*)req->ws->f;