Bug 1354796 - Close unconnected HTTP connection with NS_ERROR_NET_TIMEOUT after 90s timeout. r=mcmanus
authorHonza Bambas <honzab.moz@firemni.cz>
Wed, 03 May 2017 08:31:00 -0400
changeset 356301 fbad88a61127ff137f22d004d6cc0002397b7328
parent 356300 ab0c15933c749f9c8cac1b7f774bbe0cc5addfab
child 356302 eb1d6244cff421aebfe96027d9b0cb617a9c7e2c
push id31760
push userkwierso@gmail.com
push dateWed, 03 May 2017 20:42:27 +0000
treeherdermozilla-central@b25ad0674afd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
bugs1354796
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1354796 - Close unconnected HTTP connection with NS_ERROR_NET_TIMEOUT after 90s timeout. r=mcmanus
netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -2841,20 +2841,20 @@ nsHttpConnectionMgr::TimeoutTick()
                 nsHalfOpenSocket *half = ent->mHalfOpens[index];
                 double delta = half->Duration(currentTime);
                 // If the socket has timed out, close it so the waiting
                 // transaction will get the proper signal.
                 if (delta > maxConnectTime_ms) {
                     LOG(("Force timeout of half open to %s after %.2fms.\n",
                          ent->mConnInfo->HashKey().get(), delta));
                     if (half->SocketTransport()) {
-                        half->SocketTransport()->Close(NS_ERROR_ABORT);
+                        half->SocketTransport()->Close(NS_ERROR_NET_TIMEOUT);
                     }
                     if (half->BackupTransport()) {
-                        half->BackupTransport()->Close(NS_ERROR_ABORT);
+                        half->BackupTransport()->Close(NS_ERROR_NET_TIMEOUT);
                     }
                 }
 
                 // If this half open hangs around for 5 seconds after we've
                 // closed() it then just abandon the socket.
                 if (delta > maxConnectTime_ms + 5000) {
                     LOG(("Abandon half open to %s after %.2fms.\n",
                          ent->mConnInfo->HashKey().get(), delta));