Changeset 7034

Timestamp:

01/16/07 17:59:38 (23 months ago)

Author:

jburke

Message:

Fixes #2314 and Fixes #2334. Issues with XhrIframeProxy? in MSIE 7 and Safari.

Location:

trunk/src/io

Files:

• XhrIframeProxy.js (modified) (1 diff)
• xip_client.html (modified) (1 diff)
• xip_server.html (modified) (1 diff)

trunk/src/io/XhrIframeProxy.js

@@ -36 +36 @@
                         //Also, this server URL needs to different from the one eventually loaded by xip_client.html
                         //Otherwise, IE7 will not load it. Funky.
-                        var fullClientUrl = window.location.href.substring(0, window.location.href.lastIndexOf("/") + 1);
+                        var fullClientUrl = window.location.href;
+                        if((this.xipClientUrl + "").charAt(0) == "/"){
+                                var endIndex = fullClientUrl.indexOf("://");
+                                endIndex = fullClientUrl.indexOf("/", endIndex + 1);
+                                fullClientUrl = fullClientUrl.substring(0, endIndex);
+                        }else{
+                                fullClientUrl = fullClientUrl.substring(0, fullClientUrl.lastIndexOf("/") + 1);
+                        }
                         fullClientUrl += this.xipClientUrl;
                 

trunk/src/io/xip_client.html

@@ -144 +144 @@
 
                 while((reqData.length - reqIndex) + urlLength > xipUrlLimit){
-                        xipRequestParts.push(reqData.substring(reqIndex, reqIndex + partLength));
-                        reqIndex += partLength;
+                        var part = reqData.substring(reqIndex, reqIndex + partLength);
+                        //Safari will do some extra hex escaping unless we keep the original hex
+                        //escaping complete.
+                        var percentIndex = part.lastIndexOf("%");
+                        if(percentIndex == part.length - 1 || percentIndex == part.length - 2){
+                                part = part.substring(0, percentIndex);
+                        }
+                        xipRequestParts.push(part);
+                        reqIndex += part.length;
                 }
                 xipRequestParts.push(reqData.substring(reqIndex, reqData.length));

trunk/src/io/xip_server.html

@@ -166 +166 @@
 
                 while((resData.length - resIndex) + urlLength > xipUrlLimit){
-                        xipResponseParts.push(resData.substring(resIndex, resIndex + partLength));
-                        resIndex += partLength;
+                        var part = resData.substring(resIndex, resIndex + partLength);
+                        //Safari will do some extra hex escaping unless we keep the original hex
+                        //escaping complete.
+                        var percentIndex = part.lastIndexOf("%");
+                        if(percentIndex == part.length - 1 || percentIndex == part.length - 2){
+                                part = part.substring(0, percentIndex);
+                        }
+                        xipResponseParts.push(part);
+                        resIndex += part.length;
                 }
                 xipResponseParts.push(resData.substring(resIndex, resData.length));