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

Unified Diff: net/http/http_network_transaction.cc

Issue 4340: When an SSL connect is completed, we need to call... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction.cc
===================================================================
--- net/http/http_network_transaction.cc (revision 2678)
+++ net/http/http_network_transaction.cc (working copy)
@@ -489,12 +489,13 @@
}
int HttpNetworkTransaction::DoConnectComplete(int result) {
+ if (IsCertificateError(result))
+ result = HandleCertificateError(result);
+
if (result == OK) {
next_state_ = STATE_WRITE_HEADERS;
if (using_tunnel_)
establishing_tunnel_ = true;
- } else if (IsCertificateError(result)) {
- result = HandleCertificateError(result);
}
return result;
}
@@ -509,11 +510,11 @@
}
int HttpNetworkTransaction::DoSSLConnectOverTunnelComplete(int result) {
- if (result == OK) {
+ if (IsCertificateError(result))
+ result = HandleCertificateError(result);
+
+ if (result == OK)
next_state_ = STATE_WRITE_HEADERS;
- } else if (IsCertificateError(result)) {
- result = HandleCertificateError(result);
- }
return result;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698