------------------------------------------------------------
revno: 12612
revision-id: squid3@treenet.co.nz-20130910073628-yhvo1u6euf1xt5i3
parent: squid3@treenet.co.nz-20130910073429-v5tpyaaote8w5x0k
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2013-09-10 01:36:28 -0600
message:
  Register Http2-Settings header
  
  This header ia a hop-by-hop request-only header and requires stripping
  by intermediaries which do not support HTTP/2.0 in Upgrade feature.
  
  We register it now to ensure the stripping occurs even if broken clients
  omit it from the Connection header list.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130910073628-yhvo1u6euf1xt5i3
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 1189e98a2d67d400a20f7032a84c0c35fffbcb6a
# timestamp: 2013-09-10 07:42:10 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130910073429-\
#   v5tpyaaote8w5x0k
# 
# Begin patch
=== modified file 'src/HttpHeader.cc'
--- src/HttpHeader.cc	2013-05-19 02:34:11 +0000
+++ src/HttpHeader.cc	2013-09-10 07:36:28 +0000
@@ -107,6 +107,7 @@
     {"Expires", HDR_EXPIRES, ftDate_1123},
     {"From", HDR_FROM, ftStr},
     {"Host", HDR_HOST, ftStr},
+    {"HTTP2-Settings", HDR_HTTP2_SETTINGS, ftStr}, /* for now */
     {"If-Match", HDR_IF_MATCH, ftStr},	/* for now */
     {"If-Modified-Since", HDR_IF_MODIFIED_SINCE, ftDate_1123},
     {"If-None-Match", HDR_IF_NONE_MATCH, ftStr},	/* for now */
@@ -251,6 +252,7 @@
 static HttpHeaderMask RequestHeadersMask;	/* set run-time using RequestHeaders */
 static http_hdr_type RequestHeadersArr[] = {
     HDR_AUTHORIZATION, HDR_FROM, HDR_HOST,
+    HDR_HTTP2_SETTINGS,
     HDR_IF_MATCH, HDR_IF_MODIFIED_SINCE, HDR_IF_NONE_MATCH,
     HDR_IF_RANGE, HDR_MAX_FORWARDS,
     HDR_ORIGIN,
@@ -261,7 +263,7 @@
 
 static HttpHeaderMask HopByHopHeadersMask;
 static http_hdr_type HopByHopHeadersArr[] = {
-    HDR_CONNECTION, HDR_KEEP_ALIVE, /*HDR_PROXY_AUTHENTICATE,*/ HDR_PROXY_AUTHORIZATION,
+    HDR_CONNECTION, HDR_HTTP2_SETTINGS, HDR_KEEP_ALIVE, /*HDR_PROXY_AUTHENTICATE,*/ HDR_PROXY_AUTHORIZATION,
     HDR_TE, HDR_TRAILER, HDR_TRANSFER_ENCODING, HDR_UPGRADE, HDR_PROXY_CONNECTION
 };
 

=== modified file 'src/HttpHeader.h'
--- src/HttpHeader.h	2012-11-29 10:37:22 +0000
+++ src/HttpHeader.h	2013-09-10 07:36:28 +0000
@@ -83,6 +83,7 @@
     HDR_EXPIRES,                        /**< RFC 2608, 2616 */
     HDR_FROM,                           /**< RFC 2608, 2616 */
     HDR_HOST,                           /**< RFC 2608, 2616 */
+    HDR_HTTP2_SETTINGS,                 /**< HTTP/2.0 upgrade header. see draft-ietf-httpbis-http2-04 */
     /*HDR_IF,*/                         /* RFC 2518 */
     HDR_IF_MATCH,                       /**< RFC 2608, 2616 */
     HDR_IF_MODIFIED_SINCE,              /**< RFC 2608, 2616 */