[Pkg-javascript-commits] [sockjs-client] 224/350: Turn off sauce labs proxy. Add status code for IE8.

Fri Aug 5 01:04:24 UTC 2016

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

tonnerre-guest pushed a commit to branch upstream
in repository sockjs-client.

commit 1a022dee3fc852a8eccaa341201273fc894d2913
Author: Bryce Kahle <bkahle at gmail.com>
Date:   Thu Oct 23 11:48:58 2014 -0400

    Turn off sauce labs proxy. Add status code for IE8.
---
 .zuul.yml                             |  4 ++++
 lib/transport/browser/abstract-xhr.js |  4 ++--
 tests/html/smoke-latency.html         | 11 ++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.zuul.yml b/.zuul.yml
index 442ecf3..485fa1c 100644
--- a/.zuul.yml
+++ b/.zuul.yml
@@ -3,6 +3,10 @@ scripts:
   - "domain.js"
 server: ./tests/support/sockjs_server.js
 tunnel_provider: ngrok
+capabilities:
+  record-video: false
+  record-screenshots: false
+  avoid-proxy: true
 browsers:
   - name: chrome
     version: latest
diff --git a/lib/transport/browser/abstract-xhr.js b/lib/transport/browser/abstract-xhr.js
index 6eaed8d..ee899de 100644
--- a/lib/transport/browser/abstract-xhr.js
+++ b/lib/transport/browser/abstract-xhr.js
@@ -102,9 +102,9 @@ AbstractXHRObject.prototype._start = function(method, url, payload, opts) {
         if (status === 1223) {
           status = 204;
         }
-        // IE6 returns this for a bad port
+        // IE returns this for a bad port
         // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383770(v=vs.85).aspx
-        if (status === 12005) {
+        if (status === 12005 || status === 12029) {
           status = 0;
         }
 
diff --git a/tests/html/smoke-latency.html b/tests/html/smoke-latency.html
index 09f9f13..f12f131 100644
--- a/tests/html/smoke-latency.html
+++ b/tests/html/smoke-latency.html
@@ -13,6 +13,8 @@
 </head>
 <body>
 <form>
+  <input type="text" id="url" size="40">
+  <br />
   <select id="transport">
   <option value="">- any - </option>
   <option value="websocket">websocket</option>
@@ -76,16 +78,19 @@
         var transport = $('#transport').val() || undefined;
         log('[connecting] ' + transport);
         var url;
-        if ($('#sameOrigin').prop('checked')) {
+        if ($('#url').val()) {
+          url = $('#url').val();
+        } else if ($('#sameOrigin').prop('checked')) {
           if (window.location.origin) url = window.location.origin;
           else {
             url = window.location.protocol + '//' + window.location.hostname +
               (window.location.port ? ':' + window.location.port : '');
           }
+          url += '/echo';
         } else {
-          url = clientOptions.url;
+          url = clientOptions.url + '/echo';
         }
-        sjs = new SockJS(url + '/echo', null, transport);
+        sjs = new SockJS(url, null, transport);
         sjs.onopen = onopen
         sjs.onclose = onclose;
         sjs.onmessage = xonmessage;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/sockjs-client.git

