[master] d7f0158 Trivial test-merge of some H2 stuff

[Poul-Henning Kamp]

commit d7f0158bef740d7ccc9f7973347d455dcf9ff8e5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 30 08:50:22 2016 +0000

    Trivial test-merge of some H2 stuff

diff --git a/include/tbl/http_headers.h b/include/tbl/http_headers.h
index 198049b..12ccefd 100644
--- a/include/tbl/http_headers.h
+++ b/include/tbl/http_headers.h
@@ -83,7 +83,7 @@ H("Expect",		H_Expect,		0      )	// 2616 14.20
 H("Expires",		H_Expires,		0      )	// 2616 14.21
 H("From",		H_From,			0      )	// 2616 14.22
 H("Host",		H_Host,			0      )	// 2616 14.23
-H("HTTP2-Settings",	H_HTTP2_Settings,	P|F|I|S)	// httpbis-http2-16.txt
+H("HTTP2-Settings",	H_HTTP2_Settings,	P|F|I|S)	// 7540 3.2.1
 H("If-Match",		H_If_Match,		  F    )	// 2616 14.24
 H("If-Modified-Since",	H_If_Modified_Since,	  F    )	// 2616 14.25
 H("If-None-Match",	H_If_None_Match,	  F    )	// 2616 14.26
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index 26d8216..4a37594 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -533,5 +533,21 @@ SLTM(BackendStart, 0, "Backend request start",
 	"\n"
 )
 
+SLTM(H2RxHdr, 0, "Received HTTP2 frame header",
+	"Binary data"
+)
+
+SLTM(H2RxBody, 0, "Received HTTP2 frame body",
+	"Binary data"
+)
+
+SLTM(H2TxHdr, 0, "Received HTTP2 frame header",
+	"Binary data"
+)
+
+SLTM(H2TxBody, 0, "Received HTTP2 frame body",
+	"Binary data"
+)
+
 #undef NODEF_NOTICE
 /*lint -restore */