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

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

Issue 6804032: Add TLS-SRP (RFC 5054) support Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: remove "httpsv" scheme, minor NSS/OpenSSL changes Created 9 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_response_info.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 case STATE_SPDY_PROXY_CREATE_STREAM: 99 case STATE_SPDY_PROXY_CREATE_STREAM:
100 case STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE: 100 case STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE:
101 return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL; 101 return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL;
102 default: 102 default:
103 NOTREACHED(); 103 NOTREACHED();
104 return LOAD_STATE_IDLE; 104 return LOAD_STATE_IDLE;
105 } 105 }
106 } 106 }
107 107
108 void HttpProxyConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) { 108 void HttpProxyConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) {
109 if (error_response_info_.cert_request_info) { 109 if (error_response_info_.cert_request_info ||
110 error_response_info_.login_request_info) {
110 handle->set_ssl_error_response_info(error_response_info_); 111 handle->set_ssl_error_response_info(error_response_info_);
111 handle->set_is_ssl_error(true); 112 handle->set_is_ssl_error(true);
112 } 113 }
113 } 114 }
114 115
115 void HttpProxyConnectJob::OnIOComplete(int result) { 116 void HttpProxyConnectJob::OnIOComplete(int result) {
116 int rv = DoLoop(result); 117 int rv = DoLoop(result);
117 if (rv != ERR_IO_PENDING) 118 if (rv != ERR_IO_PENDING)
118 NotifyDelegateOfCompletion(rv); // Deletes |this| 119 NotifyDelegateOfCompletion(rv); // Deletes |this|
119 } 120 }
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 464
464 base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const { 465 base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const {
465 return base_.ConnectionTimeout(); 466 return base_.ConnectionTimeout();
466 } 467 }
467 468
468 ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const { 469 ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const {
469 return base_.histograms(); 470 return base_.histograms();
470 } 471 }
471 472
472 } // namespace net 473 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_response_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698