[master] 0b7b8e7 Comment out premature assert, I had forgotten the XXX over in H2
Poul-Henning Kamp
phk at FreeBSD.org
Mon Feb 27 11:15:06 CET 2017
commit 0b7b8e7716ba5913d5b40fb42d73a4873fe3afca
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Feb 27 10:13:43 2017 +0000
Comment out premature assert, I had forgotten the XXX over in H2
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 5bf7d81..e36c9e3 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -193,7 +193,7 @@ HTC_RxInit(struct http_conn *htc, struct ws *ws)
htc->rxbuf_e = ws->f;
if (htc->pipeline_b != NULL) {
AN(htc->pipeline_e);
- assert(WS_Inside(ws, htc->pipeline_b, htc->pipeline_e));
+ // assert(WS_Inside(ws, htc->pipeline_b, htc->pipeline_e));
l = htc->pipeline_e - htc->pipeline_b;
assert(l > 0);
assert(l <= ws->r - htc->rxbuf_b);
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index c2ab7f1..1a11609 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -821,6 +821,7 @@ h2_new_ou_session(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");
+ req->http->protover = 20;
XXXAZ(Pool_Task(wrk->pool, &req->task, TASK_QUEUE_REQ));
/* Wait for PRISM response */
More information about the varnish-commit
mailing list