Commit 47b630b0 authored by Bryan McQuade's avatar Bryan McQuade
Browse files

Bug 481612 - Should send activity distributor notifications also for STATUS_RECEIVING_FROM

r+sr=biesi
parent 3f2b3cf1
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -352,10 +352,8 @@ nsHttpTransaction::OnTransportStatus(nsresult status, PRUint64 progress)
    
    NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");

    // nsHttpChannel synthesizes progress events in OnDataAvailable
    if (status == nsISocketTransport::STATUS_RECEIVING_FROM)
        return;

    // Need to do this before the STATUS_RECEIVING_FROM check below, to make
    // sure that the activity distributor gets told about all status events.
    if (mActivityDistributor) {
        // upon STATUS_WAITING_FOR; report request body sent
        if ((mHasRequestBody) &&
@@ -376,6 +374,10 @@ nsHttpTransaction::OnTransportStatus(nsresult status, PRUint64 progress)
            EmptyCString());
    }

    // nsHttpChannel synthesizes progress events in OnDataAvailable
    if (status == nsISocketTransport::STATUS_RECEIVING_FROM)
        return;

    nsUint64 progressMax;

    if (status == nsISocketTransport::STATUS_SENDING_TO) {