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/spdy/spdy_session.h" | 5 #include "net/spdy/spdy_session.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1325 if (connection_->socket()) | 1325 if (connection_->socket()) |
1326 return connection_->socket()->GetLocalAddress(address); | 1326 return connection_->socket()->GetLocalAddress(address); |
1327 | 1327 |
1328 return ERR_SOCKET_NOT_CONNECTED; | 1328 return ERR_SOCKET_NOT_CONNECTED; |
1329 } | 1329 } |
1330 | 1330 |
1331 void SpdySession::AddPooledAlias(const SpdySessionKey& alias_key) { | 1331 void SpdySession::AddPooledAlias(const SpdySessionKey& alias_key) { |
1332 pooled_aliases_.insert(alias_key); | 1332 pooled_aliases_.insert(alias_key); |
1333 } | 1333 } |
1334 | 1334 |
| 1335 void SpdySession::RemovePooledAlias(const SpdySessionKey& alias_key) { |
| 1336 pooled_aliases_.erase(alias_key); |
| 1337 } |
| 1338 |
1335 bool SpdySession::HasAcceptableTransportSecurity() const { | 1339 bool SpdySession::HasAcceptableTransportSecurity() const { |
1336 // If we're not even using TLS, we have no standards to meet. | 1340 // If we're not even using TLS, we have no standards to meet. |
1337 if (!is_secure_) { | 1341 if (!is_secure_) { |
1338 return true; | 1342 return true; |
1339 } | 1343 } |
1340 | 1344 |
1341 SSLInfo ssl_info; | 1345 SSLInfo ssl_info; |
1342 CHECK(GetSSLInfo(&ssl_info)); | 1346 CHECK(GetSSLInfo(&ssl_info)); |
1343 | 1347 |
1344 // HTTP/2 requires TLS 1.2+ | 1348 // HTTP/2 requires TLS 1.2+ |
(...skipping 1844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3189 if (!queue->empty()) { | 3193 if (!queue->empty()) { |
3190 SpdyStreamId stream_id = queue->front(); | 3194 SpdyStreamId stream_id = queue->front(); |
3191 queue->pop_front(); | 3195 queue->pop_front(); |
3192 return stream_id; | 3196 return stream_id; |
3193 } | 3197 } |
3194 } | 3198 } |
3195 return 0; | 3199 return 0; |
3196 } | 3200 } |
3197 | 3201 |
3198 } // namespace net | 3202 } // namespace net |
OLD | NEW |