Merge 17919 - We don't handle certificate errors during SSL renegotiation....

net/http/http_network_transaction.cc

Index: net/http/http_network_transaction.cc
===================================================================
--- net/http/http_network_transaction.cc	(revision 18170)
+++ net/http/http_network_transaction.cc	(working copy)
@@ -753,6 +753,15 @@
 }
 
 int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
+  if (using_ssl_ && IsCertificateError(result)) {
+    // We don't handle a certificate error during SSL renegotiation, so we
+    // have to return an error that's not in the certificate error range
+    // (-2xx).
+    LOG(ERROR) << "Got a server certificate with error " << result
+               << " during SSL renegotiation";
+    result = ERR_CERT_ERROR_IN_SSL_RENEGOTIATION;
+  }
+
   if (result < 0)
     return HandleIOError(result);
 
Property changes on: net\http\http_network_transaction.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/net/http/http_network_transaction.cc:r17919
   Merged /branches/chrome_webkit_merge_branch/net/http/http_network_transaction.cc:r69-2775