summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_transaction.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/http/http_network_transaction.cc')
-rw-r--r--net/http/http_network_transaction.cc59
1 files changed, 0 insertions, 59 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index b25c884f..cad17af 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -30,9 +30,6 @@
using base::Time;
-// TODO(eroman): Temporary 3772 bug investigation.
-#define CRASH() *((int *)0xbbadbeef) = 0
-
namespace net {
//-----------------------------------------------------------------------------
@@ -429,13 +426,6 @@ int HttpNetworkTransaction::DoInitConnectionComplete(int result) {
// trying to reuse a keep-alive connection.
reused_socket_ = (connection_.socket() != NULL);
if (reused_socket_) {
- DCHECK(!using_ssl_ || connection_.socket()->IsSSL());
-
- // TODO(eroman): Temporary for 3772 bug investigation.
- if (using_ssl_ && !connection_.socket()->IsSSL()) {
- CRASH();
- }
-
next_state_ = STATE_WRITE_HEADERS;
} else {
next_state_ = STATE_RESOLVE_HOST;
@@ -766,11 +756,6 @@ int HttpNetworkTransaction::DoReadBodyComplete(int result) {
// Clean up the HttpConnection if we are done.
if (done) {
- // TODO(eroman): Temporary for 3772 bug investigation.
- if (keep_alive && using_ssl_ && !connection_.socket()->IsSSL()) {
- // It is invalid to be recycling a TCPClientSocket.
- CrashFor3772();
- }
if (!keep_alive)
connection_.set_socket(NULL);
connection_.Reset();
@@ -784,48 +769,6 @@ int HttpNetworkTransaction::DoReadBodyComplete(int result) {
return result;
}
-// TODO(eroman): Temporary for 3772 bug investigation.
-// ---------------------------------------------------------------------------
-struct InfoFor3772 {
- bool establishing_tunnel;
- bool using_tunnel;
- bool using_proxy;
- bool reused_socket;
- char url[256];
- int response_code;
- int64 content_length;
- HttpVersion parsed_http_version;
- HttpVersion http_version;
-};
-
-static void KeepDataAlive(InfoFor3772* info) {
- char* ptr = reinterpret_cast<char*>(info);
- if (ptr == reinterpret_cast<char*>(11)) {
- for (size_t i = 0; i < sizeof(InfoFor3772); ++i)
- ptr[i] += 11;
- }
-}
-
-void HttpNetworkTransaction::CrashFor3772() {
- // Copy some data onto the stack so it shows up in mini-dump.
- InfoFor3772 info;
- info.establishing_tunnel = establishing_tunnel_;
- info.using_tunnel = using_tunnel_;
- info.using_proxy = using_proxy_;
- info.reused_socket = reused_socket_;
- base::strlcpy(info.url, request_->url.spec().c_str(), 256);
- info.response_code = response_.headers->response_code();
- info.content_length = response_.headers->GetContentLength();
- info.parsed_http_version = response_.headers->GetParsedHttpVersion();
- info.http_version = response_.headers->GetHttpVersion();
-
- CRASH();
-
- KeepDataAlive(&info);
-}
-
-// ---------------------------------------------------------------------------
-
int HttpNetworkTransaction::DidReadResponseHeaders() {
scoped_refptr<HttpResponseHeaders> headers;
if (has_found_status_line_start()) {
@@ -913,7 +856,6 @@ int HttpNetworkTransaction::DidReadResponseHeaders() {
}
if (using_ssl_ && !establishing_tunnel_) {
- DCHECK(connection_.socket()->IsSSL());
SSLClientSocket* ssl_socket =
reinterpret_cast<SSLClientSocket*>(connection_.socket());
ssl_socket->GetSSLInfo(&response_.ssl_info);
@@ -947,7 +889,6 @@ int HttpNetworkTransaction::HandleCertificateError(int error) {
}
if (error != OK) {
- DCHECK(connection_.socket()->IsSSL());
SSLClientSocket* ssl_socket =
reinterpret_cast<SSLClientSocket*>(connection_.socket());
ssl_socket->GetSSLInfo(&response_.ssl_info);