net/http/http_server_properties.cc - Issue 2348453002: Remove NPN from SSLConfig and SSLClientSocket*.

Side by Side Diff

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

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

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

Issue 2348453002: Remove NPN from SSLConfig and SSLClientSocket*. (Closed)

Patch Set: Re: #7. Created 4 years, 3 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

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

OLD	NEW
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_server_properties.h"	5 #include "net/http/http_server_properties.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/metrics/histogram_macros.h"	8 #include "base/metrics/histogram_macros.h"

9 #include "base/strings/stringprintf.h"	9 #include "base/strings/stringprintf.h"

10 #include "net/socket/ssl_client_socket.h"	10 #include "net/socket/ssl_client_socket.h"

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 return base::StringPrintf(	87 return base::StringPrintf(

88 "%s, expires %04d-%02d-%02d %02d:%02d:%02d",	88 "%s, expires %04d-%02d-%02d %02d:%02d:%02d",

89 alternative_service.ToString().c_str(), exploded.year, exploded.month,	89 alternative_service.ToString().c_str(), exploded.year, exploded.month,

90 exploded.day_of_month, exploded.hour, exploded.minute, exploded.second);	90 exploded.day_of_month, exploded.hour, exploded.minute, exploded.second);

91 }	91 }

92	92

93 // static	93 // static

94 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {	94 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {

95 ssl_config->alpn_protos.clear();	95 ssl_config->alpn_protos.clear();

96 ssl_config->alpn_protos.push_back(kProtoHTTP11);	96 ssl_config->alpn_protos.push_back(kProtoHTTP11);

97 ssl_config->npn_protos.clear();

98 ssl_config->npn_protos.push_back(kProtoHTTP11);

99 }	97 }

100	98

101 } // namespace net	99 } // namespace net

OLD	NEW