summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 00:36:38 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 00:36:38 +0000
commit1c53a1f1fa5074d24e7324e76e55ce57bb1c33b4 (patch)
treed1779fad64dabd618b97492cfdceb79586825067 /net/http
parent28ea1c9ba0131ea88ae51c8487477e31c11ad8c6 (diff)
downloadchromium_src-1c53a1f1fa5074d24e7324e76e55ce57bb1c33b4.zip
chromium_src-1c53a1f1fa5074d24e7324e76e55ce57bb1c33b4.tar.gz
chromium_src-1c53a1f1fa5074d24e7324e76e55ce57bb1c33b4.tar.bz2
Address post-review/commit nits from wtc for r71096 ( http://codereview.chromium.org/6017010/ ) and r71071 ( http://codereview.chromium.org/6120002/ )
BUG=none TEST=none Review URL: http://codereview.chromium.org/6221004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_network_transaction.cc7
-rw-r--r--net/http/http_stream_request.cc4
2 files changed, 6 insertions, 5 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 51d962f..14c889a 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -1014,7 +1014,7 @@ int HttpNetworkTransaction::HandleCertificateRequest(int error) {
// TODO(rch): This does not correctly handle errors when an SSL proxy is
// being used, as all of the errors are handled as if they were generated
// by the endpoint host, request_->url, rather than considering if they were
-// generated by the SSL proxy. http://crbug.com/66424
+// generated by the SSL proxy. http://crbug.com/69329
int HttpNetworkTransaction::HandleSSLHandshakeError(int error) {
DCHECK(request_);
if (ssl_config_.send_client_cert &&
@@ -1062,8 +1062,9 @@ int HttpNetworkTransaction::HandleIOError(int error) {
// with the underlying connection. Because the peer may request
// renegotiation at any time, check and handle any possible SSL handshake
// related errors. In addition to renegotiation, TLS False/Snap Start may
- // cause SSL handshake errors to be delayed until the first Read on the
- // underlying connection.
+ // cause SSL handshake errors to be delayed until the first or second Write
+ // (Snap Start) or the first Read (False & Snap Start) on the underlying
+ // connection.
error = HandleSSLHandshakeError(error);
switch (error) {
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc
index 777dead..d316fa5 100644
--- a/net/http/http_stream_request.cc
+++ b/net/http/http_stream_request.cc
@@ -917,7 +917,7 @@ scoped_refptr<SSLSocketParams> HttpStreamRequest::GenerateSSLParams(
// ERR_BAD_SSL_CLIENT_AUTH_CERT).
// TODO(rch): This assumes that the HTTPS proxy will only request a
// client certificate during the initial handshake.
- // http://crbug.com/FIXME
+ // http://crbug.com/59292
ssl_config()->false_start_enabled = false;
}
@@ -1009,7 +1009,7 @@ int HttpStreamRequest::ReconsiderProxyAfterError(int error) {
return error;
}
- if (proxy_info()->is_https() && ssl_config_->send_client_cert) {
+ if (proxy_info()->is_https() && ssl_config()->send_client_cert) {
session_->ssl_client_auth_cache()->Remove(
proxy_info()->proxy_server().host_port_pair().ToString());
}