net/http/http_server_properties.h - Issue 723343002: Update from https://crrev.com/304121

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_server_properties.h

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/http/http_server_properties.h

diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h

index 337f22de3695535bca8c0cc37ba75ebeb2b8e0d2..a63dc6ad529d620f5327f883b42e36087c2bdbbf 100644

--- a/net/http/http_server_properties.h

+++ b/net/http/http_server_properties.h

@@ -57,8 +57,9 @@ enum AlternateProtocol {

NPN_SPDY_MINIMUM_VERSION = DEPRECATED_NPN_SPDY_2,

NPN_SPDY_3,

NPN_SPDY_3_1,

- NPN_SPDY_4, // SPDY4 is HTTP/2.

- NPN_SPDY_MAXIMUM_VERSION = NPN_SPDY_4,

+ NPN_SPDY_4_14, // HTTP/2 draft-14

+ NPN_SPDY_4_15, // HTTP/2 draft-15

+ NPN_SPDY_MAXIMUM_VERSION = NPN_SPDY_4_15,

QUIC,

ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION = QUIC,

UNINITIALIZED_ALTERNATE_PROTOCOL,

« no previous file with comments | « net/http/http_response_info.cc ('k') | net/http/http_server_properties.cc » ('j') | no next file with comments »