From abfb1871eafce88ab53cca42f1569c038c7c45b8 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Tue, 26 Jan 2010 14:33:03 +0100
Subject: [PATCH] Bug 534698 - nsTransportEventSinkProxy implementation eats
 event notifications, r=bz

---
 .../protocol/http/src/nsHttpTransaction.cpp   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/netwerk/protocol/http/src/nsHttpTransaction.cpp b/netwerk/protocol/http/src/nsHttpTransaction.cpp
index 7b794c150e47..8d521ce4e276 100644
--- a/netwerk/protocol/http/src/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/src/nsHttpTransaction.cpp
@@ -180,26 +180,32 @@ nsHttpTransaction::Init(PRUint8 caps,
     NS_ASSERTION(requestHead, "ouch");
     NS_ASSERTION(target, "ouch");
 
-    // create transport event sink proxy that coalesces all events
-    rv = net_NewTransportEventSinkProxy(getter_AddRefs(mTransportSink),
-                                        eventsink, target, PR_TRUE);
-    if (NS_FAILED(rv)) return rv;
-
     mActivityDistributor = do_GetService(NS_HTTPACTIVITYDISTRIBUTOR_CONTRACTID, &rv);
     if (NS_FAILED(rv)) return rv;
 
-    PRBool active;
-    rv = mActivityDistributor->GetIsActive(&active);
-    if (NS_SUCCEEDED(rv) && active) {
+    PRBool activityDistributorActive;
+    rv = mActivityDistributor->GetIsActive(&activityDistributorActive);
+    if (NS_SUCCEEDED(rv) && activityDistributorActive) {
         // there are some observers registered at activity distributor, gather
         // nsISupports for the channel that called Init()
         mChannel = do_QueryInterface(eventsink);
         LOG(("nsHttpTransaction::Init() " \
              "mActivityDistributor is active " \
              "this=%x", this));
-    } else
+    } else {
         // there is no observer, so don't use it
+        activityDistributorActive = PR_FALSE;
         mActivityDistributor = nsnull;
+    }
+
+    // create transport event sink proxy. it coalesces all events if and only 
+    // if the activity observer is not active. when the observer is active
+    // we need not to coalesce any events to get all expected notifications
+    // of the transaction state, necessary for correct debugging and logging.
+    rv = net_NewTransportEventSinkProxy(getter_AddRefs(mTransportSink),
+                                        eventsink, target,
+                                        !activityDistributorActive);
+    if (NS_FAILED(rv)) return rv;
 
     NS_ADDREF(mConnInfo = cinfo);
     mCallbacks = callbacks;