[master] 0bc64c6 A bit more H2 polishing in the train.

[Poul-Henning Kamp]

commit 0bc64c600c3707cbab4a176230105f39fd3ea76b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 9 23:46:40 2017 +0000

    A bit more H2 polishing in the train.

diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index c125d8e..0b063b7 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -202,7 +202,8 @@ h2_b64url_settings(struct h2_sess *h2, struct req *req)
 		n -= 8;
 		if (up == u + sizeof u) {
 			AZ(n);
-			h2_set_setting(h2, (void*)u);
+			if (h2_set_setting(h2, (void*)u))
+				return (-1);
 			up = u;
 		}
 	}
@@ -245,10 +246,15 @@ h2_new_ou_session(const struct worker *wrk, struct h2_sess *h2,
 	ssize_t sz;
 	enum htc_status_e hs;
 
+
+	if (h2_b64url_settings(h2, req)) {
+		VSLb(h2->vsl, SLT_Debug, "H2: Bad HTTP-Settings");
+		return (0);
+	}
+
 	sz = write(h2->sess->fd, h2_resp_101, strlen(h2_resp_101));
 	assert(sz == strlen(h2_resp_101));
 
-	AZ(h2_b64url_settings(h2, req));
 	http_Unset(req->http, H_Upgrade);
 	http_Unset(req->http, H_HTTP2_Settings);
 
@@ -270,18 +276,15 @@ h2_new_ou_session(const struct worker *wrk, struct h2_sess *h2,
 	req->task.priv = req;
 	req->err_code = 0;
 	http_SetH(req->http, HTTP_HDR_PROTO, "HTTP/2.0");
-	XXXAZ(Pool_Task(wrk->pool, &req->task, TASK_QUEUE_REQ));
 
 	/* Wait for PRISM response */
 	hs = HTC_RxStuff(h2->htc, H2_prism_complete,
 	    NULL, NULL, NAN, h2->sess->t_idle + cache_param->timeout_idle, 256);
 	if (hs != HTC_S_COMPLETE) {
-		/* XXX clean up req thread */
 		VSLb(h2->vsl, SLT_Debug, "H2: No OU PRISM (hs=%d)", hs);
-		Req_Release(req);
-		SES_Delete(h2->sess, SC_RX_JUNK, NAN);
 		return (0);
 	}
+	XXXAZ(Pool_Task(wrk->pool, &req->task, TASK_QUEUE_REQ));
 	HTC_RxPipeline(h2->htc, h2->htc->rxbuf_b + sizeof(H2_prism));
 	HTC_RxInit(h2->htc, h2->ws);
 	VSLb(h2->vsl, SLT_Debug, "H2: Got PRISM");
@@ -335,8 +338,13 @@ h2_new_session(struct worker *wrk, void *arg)
 	if (req->err_code == H2_PU_MARKER && !h2_new_pu_session(wrk, h2))
 		return;
 
-	if (req->err_code == H2_OU_MARKER && !h2_new_ou_session(wrk, h2, req))
+	if (req->err_code == H2_OU_MARKER && !h2_new_ou_session(wrk, h2, req)) {
+		CNT_AcctLogCharge(wrk->stats, req);
+		VCL_Rel(&req->vcl);
+		Req_Release(req);
+		SES_Delete(h2->sess, SC_RX_JUNK, NAN);
 		return;
+	}
 
 	THR_SetRequest(h2->srq);
 
diff --git a/bin/varnishtest/tests/t02001.vtc b/bin/varnishtest/tests/t02001.vtc
index dafcded..d461f53 100644
--- a/bin/varnishtest/tests/t02001.vtc
+++ b/bin/varnishtest/tests/t02001.vtc
@@ -61,6 +61,31 @@ client c1 {
 	} -run
 } -run
 
+client c1 {
+	# Illegal HTTP2-Settings
+	send "GET /noupgrade HTTP/1.1\r\n"
+	send "Host: foo.bar\r\n"
+	send "Upgrade: h2c\r\n"
+	send "HTTP2-Settings: #######\r\n"
+	send "\r\n"
+	expect_close
+} -run
+
+client c1 {
+	# PRISM with error in last bit
+	send "GET /noupgrade HTTP/1.1\r\n"
+	send "Host: foo.bar\r\n"
+	send "Upgrade: h2c\r\n"
+	send "HTTP2-Settings: AAMAAABkAAQAAP__\r\n"
+	send "\r\n"
+	rxresp
+	expect resp.status == 101
+	expect resp.http.upgrade == h2c
+	expect resp.http.connection == Upgrade
+	sendhex "505249202a20485454502f322e300d0a0d0a534d0d0a0d0b"
+	expect_close
+} -run
+
 # XXX: Tests temporarily neutered, they are too flakey
 #varnish v1 -expect MEMPOOL.req0.live == 0
 #varnish v1 -expect MEMPOOL.req1.live == 0