Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: net/http/http_response_info.cc

Issue 265823019: Update HTTP/2 NPN/ALPN tokens to "h2-12" to advertise draft 12 support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | net/http/http_server_properties.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_response_info.h" 5 #include "net/http/http_response_info.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/pickle.h" 8 #include "base/pickle.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "net/base/auth.h" 10 #include "net/base/auth.h"
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 switch (connection_info) { 387 switch (connection_info) {
388 case CONNECTION_INFO_UNKNOWN: 388 case CONNECTION_INFO_UNKNOWN:
389 return "unknown"; 389 return "unknown";
390 case CONNECTION_INFO_HTTP1: 390 case CONNECTION_INFO_HTTP1:
391 return "http/1"; 391 return "http/1";
392 case CONNECTION_INFO_DEPRECATED_SPDY2: 392 case CONNECTION_INFO_DEPRECATED_SPDY2:
393 return "spdy/2"; 393 return "spdy/2";
394 case CONNECTION_INFO_SPDY3: 394 case CONNECTION_INFO_SPDY3:
395 return "spdy/3"; 395 return "spdy/3";
396 case CONNECTION_INFO_SPDY4: 396 case CONNECTION_INFO_SPDY4:
397 // This is the HTTP/2 draft 11 identifier. For internal 397 // This is the HTTP/2 draft 12 identifier. For internal
398 // consistency, HTTP/2 is named SPDY4 within Chromium. 398 // consistency, HTTP/2 is named SPDY4 within Chromium.
399 return "h2-11"; 399 return "h2-12";
400 case CONNECTION_INFO_QUIC1_SPDY3: 400 case CONNECTION_INFO_QUIC1_SPDY3:
401 return "quic/1+spdy/3"; 401 return "quic/1+spdy/3";
402 case NUM_OF_CONNECTION_INFOS: 402 case NUM_OF_CONNECTION_INFOS:
403 break; 403 break;
404 } 404 }
405 NOTREACHED(); 405 NOTREACHED();
406 return ""; 406 return "";
407 } 407 }
408 408
409 } // namespace net 409 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_server_properties.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698