[Pkg-mozext-commits] [firebug] 55/68: Issue 6436: XMLHttpRequests not displayed in Console tab with FF 17, FB 1.11.3

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag fbtest-1.11.4
in repository firebug.

commit 0df622a08ef9dc87c4f9afd922a3cdb026b7506e
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Wed May 15 17:36:52 2013 +0200

    Issue 6436: 	XMLHttpRequests not displayed in Console tab with FF 17, FB 1.11.3
---
 extension/content/firebug/net/spy.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension/content/firebug/net/spy.js b/extension/content/firebug/net/spy.js
index 05fbed5..65e2cd8 100644
--- a/extension/content/firebug/net/spy.js
+++ b/extension/content/firebug/net/spy.js
@@ -48,6 +48,7 @@ var redirectionLimit = Options.getPref("network.http", "redirection-limit");
 var versionChecker = Xpcom.CCSV("@mozilla.org/xpcom/version-comparator;1", "nsIVersionComparator");
 var appInfo = Xpcom.CCSV("@mozilla.org/xre/app-info;1", "nsIXULAppInfo");
 var fx20 = versionChecker.compare(appInfo.version, "20") >= 0;
+var fx18 = versionChecker.compare(appInfo.version, "18") >= 0;
 
 // ********************************************************************************************* //
 // Spy Module
@@ -293,7 +294,9 @@ var SpyHttpObserver =
 
             // There is no http-on-opening-request in case of redirect so, we need
             // to use http-on-modify-request.
-            if ((topic == "http-on-modify-request" && redirect) ||
+            // Also, http-on-opening-request has been introduced in Firefox 18 so,
+            // we still need to use http-on-modify-request in previous versions (issue 6436)
+            if ((topic == "http-on-modify-request" && (redirect || !fx18)) ||
                 topic == "http-on-opening-request" ||
                 topic == "http-on-examine-response" ||
                 topic == "http-on-examine-cached-response")
@@ -329,7 +332,7 @@ var SpyHttpObserver =
                 var requestName = request.URI.asciiSpec;
                 var requestMethod = request.requestMethod;
 
-                if (topic == "http-on-modify-request" && redirect)
+                if (topic == "http-on-modify-request" && (redirect || !fx18))
                     this.requestStarted(request, xhr, spyContext, requestMethod, requestName);
                 else if (topic == "http-on-opening-request")
                     this.requestStarted(request, xhr, spyContext, requestMethod, requestName);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git