diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 18:56:34 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 18:56:34 +0000 |
| commit | 5285d9763b1680e6344425ec29e3c92e8bfc9b3d (patch) | |
| tree | fa0d67ea7578fb6c7ee34e644222b5d2cf768e55 /net/http/http_network_transaction.cc | |
| parent | c6e6617d80159e7c1dbf00ebf44f82b52f89f4ff (diff) | |
| download | chromium_src-5285d9763b1680e6344425ec29e3c92e8bfc9b3d.zip chromium_src-5285d9763b1680e6344425ec29e3c92e8bfc9b3d.tar.gz chromium_src-5285d9763b1680e6344425ec29e3c92e8bfc9b3d.tar.bz2 | |
net: rework the NPN patch.
This change moves the protocol selection logic out of NSS and into Chromium
code. This allows some things to be a little cleaner (no more wire-encoded NPN
strings) and also allows for some tricks that we have been considering for
SPDY+WebSockets.
As a consequence of this change, next protocols are now a
std::vector<std::string> rather than an encoded char*
BUG=none
TEST=SPDY still works with Google sites.
Review URL: http://codereview.chromium.org/8156001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction.cc')
| -rw-r--r-- | net/http/http_network_transaction.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 0169d96..84df782 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -109,9 +109,9 @@ HttpNetworkTransaction::HttpNetworkTransaction(HttpNetworkSession* session) next_state_(STATE_NONE), establishing_tunnel_(false) { session->ssl_config_service()->GetSSLConfig(&server_ssl_config_); - if (session->http_stream_factory()->next_protos()) { + if (session->http_stream_factory()->has_next_protos()) { server_ssl_config_.next_protos = - *session->http_stream_factory()->next_protos(); + session->http_stream_factory()->next_protos(); } proxy_ssl_config_ = server_ssl_config_; } |