- cleanup msxml2 setup. See comments about the correct MSXML2.XMLHTTP…

… usage at http://blogs.msdn.com/b/xmlteam/archive/2006/10/23/using-the-right-version-of-msxml-in-internet-explorer.aspx
zopefoundation · May 4, 2012 · 92ebbcf · 92ebbcf
1 parent f1c7ba7
commit 92ebbcf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,8 +2,11 @@
 CHANGES
 =======
 
-0.5.1dev (unreleased)
----------------------
+0.5.1 (unreleased)
+------------------
+
+- cleanup msxml2 setup. See comments about the correct MSXML2.XMLHTTP usage at
+  http://blogs.msdn.com/b/xmlteam/archive/2006/10/23/using-the-right-version-of-msxml-in-internet-explorer.aspx
 
 - Removed slugs for ZPKG and ZCML.
 

diff --git a/src/z3c/xmlhttp/js/z3c.xmlhttp-0.5.0.js b/src/z3c/xmlhttp/js/z3c.xmlhttp-0.5.0.js
@@ -214,12 +214,16 @@ getXmlHttpRequest = function() {
         }
         return req;
     }
+    // see comments about the MSXML2.XMLHTTP order,
+    // http://blogs.msdn.com/b/xmlteam/archive/2006/10/23/
+    // using-the-right-version-of-msxml-in-internet-explorer.aspx
     else if (window.ActiveXObject) {
         var MSXML_XMLHTTP_IDS = new Array(
-            "MSXML2.XMLHTTP.5.0",
-            "MSXML2.XMLHTTP.4.0",
+            "MSXML2.XMLHTTP.6.0",
             "MSXML2.XMLHTTP.3.0",
             "MSXML2.XMLHTTP",
+            "MSXML2.XMLHTTP.5.0",
+            "MSXML2.XMLHTTP.4.0",
             "Microsoft.XMLHTTP");
         var success = false;
         for (var i = 0; i < MSXML_XMLHTTP_IDS.length && !success; i++) {