2 files changed, 5 insertions, 9 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 3291710..7cf599e 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -615,9 +615,6 @@ int HttpNetworkTransaction::DoInitStream() {
 int HttpNetworkTransaction::DoInitStreamComplete(int result) {
   if (result == OK) {
     next_state_ = STATE_GENERATE_PROXY_AUTH_TOKEN;
-
-    if (is_https_request())
-      stream_->GetSSLInfo(&response_.ssl_info);
   } else {
     if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED)
       result = HandleCertificateRequest(result);
@@ -855,6 +852,9 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
   if (rv != OK)
     return rv;
 
+  if (is_https_request())
+    stream_->GetSSLInfo(&response_.ssl_info);
+
   headers_valid_ = true;
   return OK;
 }
diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc
index ce115b3..512f509 100644
--- a/net/http/http_stream_parser.cc
+++ b/net/http/http_stream_parser.cc
@@ -603,9 +603,7 @@ void HttpStreamParser::SetConnectionReused() {
 }
 
 void HttpStreamParser::GetSSLInfo(SSLInfo* ssl_info) {
-  if (request_->url.SchemeIs("https")) {
-    if (!connection_->socket() || !connection_->socket()->IsConnected())
-      return;
+  if (request_->url.SchemeIs("https") && connection_->socket()) {
     SSLClientSocket* ssl_socket =
         static_cast<SSLClientSocket*>(connection_->socket());
     ssl_socket->GetSSLInfo(ssl_info);
@@ -614,9 +612,7 @@ void HttpStreamParser::GetSSLInfo(SSLInfo* ssl_info) {
 
 void HttpStreamParser::GetSSLCertRequestInfo(
     SSLCertRequestInfo* cert_request_info) {
-  if (request_->url.SchemeIs("https")) {
-    if (!connection_->socket() || !connection_->socket()->IsConnected())
-      return;
+  if (request_->url.SchemeIs("https") && connection_->socket()) {
     SSLClientSocket* ssl_socket =
         static_cast<SSLClientSocket*>(connection_->socket());
     ssl_socket->GetSSLCertRequestInfo(cert_request_info);