Issue 5773: Firebug no longer displays 304 Not Modified lines in NET …

…panel
firebug · Aug 2, 2012 · 7d75b94 · 7d75b94
1 parent eb09537
commit 7d75b94
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 28 deletions.
diff --git a/extension/content/firebug/cookies/cookieModule.js b/extension/content/firebug/cookies/cookieModule.js
@@ -195,9 +195,6 @@ Firebug.CookieModule = Obj.extend(Firebug.ActivableModule,
 
         observerService.addObserver(HttpObserver, "http-on-modify-request", false);
         observerService.addObserver(HttpObserver, "http-on-examine-response", false);
-        observerService.addObserver(HttpObserver, "http-on-examine-cached-response", false);
-        observerService.addObserver(HttpObserver, "http-on-examine-merged-response", false);
-
         observerService.addObserver(PermissionObserver, "perm-changed", false);
         registerCookieObserver(CookieObserver);
         prefs.addObserver(networkPrefDomain, PrefObserver, false);
@@ -220,9 +217,6 @@ Firebug.CookieModule = Obj.extend(Firebug.ActivableModule,
 
         observerService.removeObserver(HttpObserver, "http-on-modify-request");
         observerService.removeObserver(HttpObserver, "http-on-examine-response");
-        observerService.removeObserver(HttpObserver, "http-on-examine-cached-response");
-        observerService.removeObserver(HttpObserver, "http-on-examine-merged-response");
-
         observerService.removeObserver(PermissionObserver, "perm-changed");
         unregisterCookieObserver(CookieObserver);
         prefs.removeObserver(networkPrefDomain, PrefObserver);

diff --git a/extension/content/firebug/cookies/httpObserver.js b/extension/content/firebug/cookies/httpObserver.js
@@ -40,14 +40,11 @@ var HttpObserver = Obj.extend(BaseObserver,
     {
         try {
             aSubject = aSubject.QueryInterface(Ci.nsIHttpChannel);
-            if (aTopic == "http-on-modify-request")
+            if (aTopic == "http-on-modify-request") {
                 this.onModifyRequest(aSubject);
-            else if (aTopic == "http-on-examine-response")
-                this.onExamineResponse(aSubject);
-            else if (aTopic == "http-on-examine-cached-response")
-                this.onExamineResponse(aSubject);
-            else if (aTopic == "http-on-examine-merged-response")
+            } else if (aTopic == "http-on-examine-response") {
                 this.onExamineResponse(aSubject);
+            }
         }
         catch (err)
         {

diff --git a/extension/content/firebug/js/tabCache.js b/extension/content/firebug/js/tabCache.js
@@ -202,8 +202,6 @@ Firebug.TabCacheModel = Obj.extend(Firebug.ActivableModule,
                 this.onExamineResponse(subject, win);
             else if (topic == "http-on-examine-cached-response")
                 this.onCachedResponse(subject, win);
-            else if (topic == "http-on-examine-merged-response")
-                this.onCachedResponse(subject, win);
         }
         catch (err)
         {

diff --git a/extension/content/firebug/net/netMonitor.js b/extension/content/firebug/net/netMonitor.js
@@ -399,8 +399,6 @@ var NetHttpObserver =
                 this.onExamineResponse(subject, win, tabId, context);
             else if (topic == "http-on-examine-cached-response")
                 this.onExamineCachedResponse(subject, win, tabId, context);
-            else if (topic == "http-on-examine-merged-response")
-                this.onExamineCachedResponse(subject, win, tabId, context);
         }
         catch (err)
         {

diff --git a/extension/content/firebug/net/requestObserver.js b/extension/content/firebug/net/requestObserver.js
@@ -49,7 +49,6 @@ var HttpRequestObserver =
             observerService.addObserver(this, "http-on-modify-request", false);
             observerService.addObserver(this, "http-on-examine-response", false);
             observerService.addObserver(this, "http-on-examine-cached-response", false);
-            observerService.addObserver(this, "http-on-examine-merged-response", false);
         }
 
         this.observing = true;
@@ -66,7 +65,6 @@ var HttpRequestObserver =
             observerService.removeObserver(this, "http-on-modify-request");
             observerService.removeObserver(this, "http-on-examine-response");
             observerService.removeObserver(this, "http-on-examine-cached-response");
-            observerService.removeObserver(this, "http-on-examine-merged-response");
         }
 
         this.observing = false;
@@ -85,8 +83,7 @@ var HttpRequestObserver =
             // Notify all registered observers.
             if (topic == "http-on-modify-request" ||
                 topic == "http-on-examine-response" ||
-                topic == "http-on-examine-cached-response" ||
-                topic == "http-on-examine-merged-response")
+                topic == "http-on-examine-cached-response")
             {
                 this.notifyObservers(subject, topic, data);
             }

diff --git a/extension/content/firebug/net/spy.js b/extension/content/firebug/net/spy.js
@@ -278,8 +278,7 @@ var SpyHttpObserver =
         {
             if (topic != "http-on-modify-request" &&
                 topic != "http-on-examine-response" &&
-                topic != "http-on-examine-cached-response" &&
-                topic != "http-on-examine-merged-response")
+                topic != "http-on-examine-cached-response")
             {
                 if (FBTrace.DBG_ERRORS || FBTrace.DBG_SPY)
                     FBTrace.sysout("spy.SpyHttpObserver.observe; ERROR Unknown topic: " + topic);
@@ -320,8 +319,6 @@ var SpyHttpObserver =
                     this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
                 else if (topic == "http-on-examine-cached-response")
                     this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
-                else if (topic == "http-on-examine-merged-response")
-                    this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
 
                 return;
             }

diff --git a/extension/modules/firebug-http-observer.js b/extension/modules/firebug-http-observer.js
@@ -69,7 +69,6 @@ var httpRequestObserver =
             observerService.addObserver(this, "http-on-modify-request", false);
             observerService.addObserver(this, "http-on-examine-response", false);
             observerService.addObserver(this, "http-on-examine-cached-response", false);
-            observerService.addObserver(this, "http-on-examine-merged-response", false);
         }
 
         this.observing = true;
@@ -86,7 +85,6 @@ var httpRequestObserver =
             observerService.removeObserver(this, "http-on-modify-request");
             observerService.removeObserver(this, "http-on-examine-response");
             observerService.removeObserver(this, "http-on-examine-cached-response");
-            observerService.removeObserver(this, "http-on-examine-merged-response");
         }
 
         this.observing = false;
@@ -113,8 +111,7 @@ var httpRequestObserver =
             // Notify all registered observers.
             if (topic == "http-on-modify-request" ||
                 topic == "http-on-examine-response" ||
-                topic == "http-on-examine-cached-response" ||
-                topic == "http-on-examine-merged-response")
+                topic == "http-on-examine-cached-response")
             {
                 this.notifyObservers(subject, topic, data);
             }