bug 798243 spdy enable reading of ping reply r=honzab
authorPatrick McManus <mcmanus@ducksong.com>
Fri, 05 Oct 2012 15:03:14 -0400
changeset 109447 39d7c39c6ac21ed62594a74283940b01bb06c55a
parent 109446 56cf71c15ef34b792b5ec68e54a49d686e56eeeb
child 109448 b0431ae9cad50727b11a6e37dfd362b1f494c7e2
push id23630
push useremorley@mozilla.com
push dateSat, 06 Oct 2012 19:35:27 +0000
treeherdermozilla-central@9f677c2bb33d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershonzab
bugs798243
milestone18.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 798243 spdy enable reading of ping reply r=honzab
netwerk/protocol/http/SpdySession2.cpp
netwerk/protocol/http/SpdySession3.cpp
--- a/netwerk/protocol/http/SpdySession2.cpp
+++ b/netwerk/protocol/http/SpdySession2.cpp
@@ -265,16 +265,17 @@ SpdySession2::ReadTimeoutTick(PRInterval
       return;
     }
 
     mPingSentEpoch = PR_IntervalNow();
     if (!mPingSentEpoch)
       mPingSentEpoch = 1; // avoid the 0 sentinel value
     GeneratePing(mNextPingID);
     mNextPingID += 2;
+    ResumeRecv(); // read the ping reply
 
     if (mNextPingID == 0xffffffff) {
       LOG(("SpdySession2::ReadTimeoutTick %p "
            "ping ids exhausted marking goaway\n", this));
       mShouldGoAway = true;
     }
 }
 
--- a/netwerk/protocol/http/SpdySession3.cpp
+++ b/netwerk/protocol/http/SpdySession3.cpp
@@ -266,16 +266,17 @@ SpdySession3::ReadTimeoutTick(PRInterval
       return;
     }
 
     mPingSentEpoch = PR_IntervalNow();
     if (!mPingSentEpoch)
       mPingSentEpoch = 1; // avoid the 0 sentinel value
     GeneratePing(mNextPingID);
     mNextPingID += 2;
+    ResumeRecv(); // read the ping reply
 
     if (mNextPingID == 0xffffffff) {
       LOG(("SpdySession3::ReadTimeoutTick %p "
            "ping ids exhausted marking goaway\n", this));
       mShouldGoAway = true;
     }
 }