From 393066e5b5d1e34f2b8b7cce778d45a12dbe4c66 Mon Sep 17 00:00:00 2001 From: dahollings Date: Thu, 18 Jan 2018 11:14:00 -0800 Subject: [PATCH] Adding [HTTP2-Settings] HTTP header. http://httpwg.org/specs/rfc7540.html#Http2SettingsHeader RELNOTES=Defining "HTTP2-Settings" HTTP header according to http://httpwg.org/specs/rfc7540.html#Http2SettingsHeader ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=182408190 --- .../test/com/google/common/net/HttpHeadersTest.java | 3 ++- android/guava/src/com/google/common/net/HttpHeaders.java | 7 +++++++ .../test/com/google/common/net/HttpHeadersTest.java | 3 ++- guava/src/com/google/common/net/HttpHeaders.java | 7 +++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/android/guava-tests/test/com/google/common/net/HttpHeadersTest.java b/android/guava-tests/test/com/google/common/net/HttpHeadersTest.java index bdf290e4b371..a9d6253ba6d2 100755 --- a/android/guava-tests/test/com/google/common/net/HttpHeadersTest.java +++ b/android/guava-tests/test/com/google/common/net/HttpHeadersTest.java @@ -44,7 +44,8 @@ public void testConstantNameMatchesString() throws Exception { "X_WEBKIT_CSP_REPORT_ONLY", "X-WebKit-CSP-Report-Only"); ImmutableSet uppercaseAcronyms = - ImmutableSet.of("ID", "DNT", "DNS", "IP", "MD5", "P3P", "TE", "UID", "URL", "WWW", "XSS"); + ImmutableSet.of( + "ID", "DNT", "DNS", "HTTP2", "IP", "MD5", "P3P", "TE", "UID", "URL", "WWW", "XSS"); assertConstantNameMatchesString(HttpHeaders.class, specialCases, uppercaseAcronyms); } diff --git a/android/guava/src/com/google/common/net/HttpHeaders.java b/android/guava/src/com/google/common/net/HttpHeaders.java index a9ef5b8b66fa..648a5857174b 100755 --- a/android/guava/src/com/google/common/net/HttpHeaders.java +++ b/android/guava/src/com/google/common/net/HttpHeaders.java @@ -92,6 +92,13 @@ private HttpHeaders() {} public static final String FOLLOW_ONLY_WHEN_PRERENDER_SHOWN = "Follow-Only-When-Prerender-Shown"; /** The HTTP {@code Host} header field name. */ public static final String HOST = "Host"; + /** + * The HTTP {@code HTTP2-Settings} + * header field name. + * + * @since NEXT + */ + public static final String HTTP2_SETTINGS = "HTTP2-Settings"; /** The HTTP {@code If-Match} header field name. */ public static final String IF_MATCH = "If-Match"; /** The HTTP {@code If-Modified-Since} header field name. */ diff --git a/guava-tests/test/com/google/common/net/HttpHeadersTest.java b/guava-tests/test/com/google/common/net/HttpHeadersTest.java index bdf290e4b371..a9d6253ba6d2 100644 --- a/guava-tests/test/com/google/common/net/HttpHeadersTest.java +++ b/guava-tests/test/com/google/common/net/HttpHeadersTest.java @@ -44,7 +44,8 @@ public void testConstantNameMatchesString() throws Exception { "X_WEBKIT_CSP_REPORT_ONLY", "X-WebKit-CSP-Report-Only"); ImmutableSet uppercaseAcronyms = - ImmutableSet.of("ID", "DNT", "DNS", "IP", "MD5", "P3P", "TE", "UID", "URL", "WWW", "XSS"); + ImmutableSet.of( + "ID", "DNT", "DNS", "HTTP2", "IP", "MD5", "P3P", "TE", "UID", "URL", "WWW", "XSS"); assertConstantNameMatchesString(HttpHeaders.class, specialCases, uppercaseAcronyms); } diff --git a/guava/src/com/google/common/net/HttpHeaders.java b/guava/src/com/google/common/net/HttpHeaders.java index a9ef5b8b66fa..648a5857174b 100644 --- a/guava/src/com/google/common/net/HttpHeaders.java +++ b/guava/src/com/google/common/net/HttpHeaders.java @@ -92,6 +92,13 @@ private HttpHeaders() {} public static final String FOLLOW_ONLY_WHEN_PRERENDER_SHOWN = "Follow-Only-When-Prerender-Shown"; /** The HTTP {@code Host} header field name. */ public static final String HOST = "Host"; + /** + * The HTTP {@code HTTP2-Settings} + * header field name. + * + * @since NEXT + */ + public static final String HTTP2_SETTINGS = "HTTP2-Settings"; /** The HTTP {@code If-Match} header field name. */ public static final String IF_MATCH = "If-Match"; /** The HTTP {@code If-Modified-Since} header field name. */