bug 1072478 backout 047afa953b9c for 1119810 and 1119926 r=backout
authorPatrick McManus <mcmanus@ducksong.com>
Fri, 09 Jan 2015 15:33:58 -0500
changeset 223122 2487f8ac51dd31c1c39ac062a287f2287cb496f3
parent 223121 0e94aaed6ea2554102911b507d180548ba1a149a
child 223123 f0cd9e9e87aa30a6c7f0d53c45a0417a6b4f281a
push id10769
push usercbook@mozilla.com
push dateMon, 12 Jan 2015 14:15:52 +0000
treeherderfx-team@0e9765732906 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1072478, 1119810, 1119926
milestone37.0a1
bug 1072478 backout 047afa953b9c for 1119810 and 1119926 r=backout
netwerk/protocol/http/Http2Push.cpp
netwerk/protocol/http/SpdyPush31.cpp
--- a/netwerk/protocol/http/Http2Push.cpp
+++ b/netwerk/protocol/http/Http2Push.cpp
@@ -348,23 +348,23 @@ Http2PushTransactionBuffer::WriteSegment
                                        count, countWritten);
   if (NS_SUCCEEDED(rv)) {
     mBufferedHTTP1Used += *countWritten;
   }
   else if (rv == NS_BASE_STREAM_CLOSED) {
     mIsDone = true;
   }
 
-  if (Available() || mIsDone) {
+  if (Available()) {
     Http2Stream *consumer = mPushStream->GetConsumerStream();
 
     if (consumer) {
       LOG3(("Http2PushTransactionBuffer::WriteSegments notifying connection "
-            "consumer data available 0x%X [%u] done=%d\n",
-            mPushStream->StreamID(), Available(), mIsDone));
+            "consumer data available 0x%X [%u]\n",
+            mPushStream->StreamID(), Available()));
       mPushStream->ConnectPushedStream(consumer);
     }
   }
 
   return rv;
 }
 
 uint32_t
--- a/netwerk/protocol/http/SpdyPush31.cpp
+++ b/netwerk/protocol/http/SpdyPush31.cpp
@@ -277,23 +277,23 @@ SpdyPush31TransactionBuffer::WriteSegmen
                                        count, countWritten);
   if (NS_SUCCEEDED(rv)) {
     mBufferedHTTP1Used += *countWritten;
   }
   else if (rv == NS_BASE_STREAM_CLOSED) {
     mIsDone = true;
   }
 
-  if (Available() || mIsDone) {
+  if (Available()) {
     SpdyStream31 *consumer = mPushStream->GetConsumerStream();
 
     if (consumer) {
       LOG3(("SpdyPush31TransactionBuffer::WriteSegments notifying connection "
-            "consumer data available 0x%X [%u] done=%d\n",
-            mPushStream->StreamID(), Available(), mIsDone));
+            "consumer data available 0x%X [%u]\n",
+            mPushStream->StreamID(), Available()));
       mPushStream->ConnectPushedStream(consumer);
     }
   }
 
   return rv;
 }
 
 uint32_t