summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 22:09:30 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 22:09:30 +0000
commit096fa7b6ccf1c147a4c510516c6aa93419bb4d0a (patch)
treefe0f9a47490b20a4cad3931484ac9ce6c51eda39 /net/websockets
parent44e1fbf0fd0a14a375ebbbc56392956683f6261c (diff)
downloadchromium_src-096fa7b6ccf1c147a4c510516c6aa93419bb4d0a.zip
chromium_src-096fa7b6ccf1c147a4c510516c6aa93419bb4d0a.tar.gz
chromium_src-096fa7b6ccf1c147a4c510516c6aa93419bb4d0a.tar.bz2
Initialize protocol_version to Unknown.
R=mmenke TEST=network unittests BUG=108134 Review URL: http://codereview.chromium.org/8956042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 7a308e1..f989c06 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -581,7 +581,8 @@ int WebSocketJob::TrySpdyStream() {
spdy_pool->Get(pair, *socket_->net_log());
SSLInfo ssl_info;
bool was_npn_negotiated;
- SSLClientSocket::NextProto protocol_negotiated;
+ SSLClientSocket::NextProto protocol_negotiated =
+ SSLClientSocket::kProtoUnknown;
bool use_ssl = spdy_session->GetSSLInfo(
&ssl_info, &was_npn_negotiated, &protocol_negotiated);
if (socket_->is_secure() && !use_ssl)