summaryrefslogtreecommitdiffstats
path: root/net/http/http_proxy_client_socket_pool.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 17:10:14 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 17:10:14 +0000
commit102957f8a81d2aeb4e0069603977221a3b93a0bd (patch)
treea69ebeb9bce5664d399e66e6452ebc62b25993cb /net/http/http_proxy_client_socket_pool.cc
parent0c9649c6ab1dbc87b133ccd561e8ecfd91cd6c73 (diff)
downloadchromium_src-102957f8a81d2aeb4e0069603977221a3b93a0bd.zip
chromium_src-102957f8a81d2aeb4e0069603977221a3b93a0bd.tar.gz
chromium_src-102957f8a81d2aeb4e0069603977221a3b93a0bd.tar.bz2
Change HttpNetworkTransaction and HttpStreamFactoryImpl::Job
to keep different SSLConfig objects for HTTPS Proxies vs HTTPS Servers. Add an is_proxy field to SSLCertRequest indicating if the request came from a proxy or from an origin server. BUG=95071 Review URL: http://codereview.chromium.org/7768002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_proxy_client_socket_pool.cc')
-rw-r--r--net/http/http_proxy_client_socket_pool.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index eb90b53..69af61f 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -11,6 +11,7 @@
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
+#include "net/base/ssl_cert_request_info.h"
#include "net/http/http_network_session.h"
#include "net/http/http_proxy_client_socket.h"
#include "net/socket/client_socket_factory.h"
@@ -214,6 +215,7 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) {
if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) {
error_response_info_ = transport_socket_handle_->ssl_error_response_info();
DCHECK(error_response_info_.cert_request_info.get());
+ error_response_info_.cert_request_info->is_proxy = true;
return result;
}
if (IsCertificateError(result)) {