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

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

Issue 2347163002: s/NPN/ALPN/ (Closed)
Patch Set: Re: #12. 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/base/net_error_list.h ('k') | net/http/http_network_transaction_unittest.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_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_); 450 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
451 DCHECK(stream_request_.get()); 451 DCHECK(stream_request_.get());
452 452
453 if (stream_) { 453 if (stream_) {
454 total_received_bytes_ += stream_->GetTotalReceivedBytes(); 454 total_received_bytes_ += stream_->GetTotalReceivedBytes();
455 total_sent_bytes_ += stream_->GetTotalSentBytes(); 455 total_sent_bytes_ += stream_->GetTotalSentBytes();
456 } 456 }
457 stream_.reset(stream); 457 stream_.reset(stream);
458 server_ssl_config_ = used_ssl_config; 458 server_ssl_config_ = used_ssl_config;
459 proxy_info_ = used_proxy_info; 459 proxy_info_ = used_proxy_info;
460 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); 460 response_.was_alpn_negotiated = stream_request_->was_alpn_negotiated();
461 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( 461 response_.alpn_negotiated_protocol = SSLClientSocket::NextProtoToString(
462 stream_request_->negotiated_protocol()); 462 stream_request_->negotiated_protocol());
463 response_.was_fetched_via_spdy = stream_request_->using_spdy(); 463 response_.was_fetched_via_spdy = stream_request_->using_spdy();
464 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); 464 response_.was_fetched_via_proxy = !proxy_info_.is_direct();
465 if (response_.was_fetched_via_proxy && !proxy_info_.is_empty()) 465 if (response_.was_fetched_via_proxy && !proxy_info_.is_empty())
466 response_.proxy_server = proxy_info_.proxy_server().host_port_pair(); 466 response_.proxy_server = proxy_info_.proxy_server().host_port_pair();
467 OnIOComplete(OK); 467 OnIOComplete(OK);
468 } 468 }
469 469
470 void HttpNetworkTransaction::OnBidirectionalStreamImplReady( 470 void HttpNetworkTransaction::OnBidirectionalStreamImplReady(
471 const SSLConfig& used_ssl_config, 471 const SSLConfig& used_ssl_config,
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1636 DCHECK(stream_request_); 1636 DCHECK(stream_request_);
1637 1637
1638 // Since the transaction can restart with auth credentials, it may create a 1638 // Since the transaction can restart with auth credentials, it may create a
1639 // stream more than once. Accumulate all of the connection attempts across 1639 // stream more than once. Accumulate all of the connection attempts across
1640 // those streams by appending them to the vector: 1640 // those streams by appending them to the vector:
1641 for (const auto& attempt : stream_request_->connection_attempts()) 1641 for (const auto& attempt : stream_request_->connection_attempts())
1642 connection_attempts_.push_back(attempt); 1642 connection_attempts_.push_back(attempt);
1643 } 1643 }
1644 1644
1645 } // namespace net 1645 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_error_list.h ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698