Bug 1359496 - Remove code added in bug 1340164. This code was taking care that we do not send multiple socket status events. r=mcmanus

netwerk/protocol/http/nsHttpTransaction.cpp

@@ -143,7 +143,6 @@ nsHttpTransaction::nsHttpTransaction()
     , mClassOfService(0)
     , m0RTTInProgress(false)
     , mEarlyDataDisposition(EARLY_NONE)
-    , mTransportStatus(NS_OK)
 {
     LOG(("Creating nsHttpTransaction @%p\n", this));
 
@@ -520,50 +519,6 @@ nsHttpTransaction::OnTransportStatus(nsITransport* transport,
     LOG(("nsHttpTransaction::OnSocketStatus [this=%p status=%" PRIx32 " progress=%" PRId64 "]\n",
          this, static_cast<uint32_t>(status), progress));
 
-    // A transaction can given to multiple HalfOpen sockets (this is a bug in
-    // nsHttpConnectionMgr). We are going to fix it here as a work around to be
-    // able to uplift it.
-    switch(status) {
-    case NS_NET_STATUS_RESOLVING_HOST:
-        if (mTransportStatus != NS_OK) {
-            LOG(("nsHttpTransaction::OnSocketStatus - ignore socket events "
-                 "from backup transport"));
-            return;
-        }
-        break;
-    case NS_NET_STATUS_RESOLVED_HOST:
-        if (mTransportStatus != NS_NET_STATUS_RESOLVING_HOST &&
-            mTransportStatus != NS_OK) {
-            LOG(("nsHttpTransaction::OnSocketStatus - ignore socket events "
-                 "from backup transport"));
-            return;
-        }
-        break;
-    case NS_NET_STATUS_CONNECTING_TO:
-        if (mTransportStatus != NS_NET_STATUS_RESOLVING_HOST &&
-            mTransportStatus != NS_NET_STATUS_RESOLVED_HOST  &&
-            mTransportStatus != NS_OK) {
-            LOG(("nsHttpTransaction::OnSocketStatus - ignore socket events "
-                 "from backup transport"));
-            return;
-        }
-        break;
-    case NS_NET_STATUS_CONNECTED_TO:
-        if (mTransportStatus != NS_NET_STATUS_RESOLVING_HOST &&
-            mTransportStatus != NS_NET_STATUS_RESOLVED_HOST &&
-            mTransportStatus != NS_NET_STATUS_CONNECTING_TO &&
-            mTransportStatus != NS_OK) {
-            LOG(("nsHttpTransaction::OnSocketStatus - ignore socket events "
-                 "from backup transport"));
-            return;
-        }
-        break;
-    default:
-        LOG(("nsHttpTransaction::OnSocketStatus - a new event"));
-    }
-
-    mTransportStatus = status;
-
     if (status == NS_NET_STATUS_CONNECTED_TO ||
         status == NS_NET_STATUS_WAITING_FOR) {
         nsISocketTransport *socketTransport =
@@ -1202,8 +1157,6 @@ nsHttpTransaction::Restart()
         }
     }
 
-    mTransportStatus = NS_OK;
-
     return gHttpHandler->InitiateTransaction(this, mPriority);
 }
 

netwerk/protocol/http/nsHttpTransaction.h

@@ -420,8 +420,6 @@ private:
         EARLY_SENT,
         EARLY_ACCEPTED
     } mEarlyDataDisposition;
-
-    nsresult                        mTransportStatus;
 };
 
 } // namespace net