Merge branch 'r2.2.3'

pusher · Sep 10, 2014 · 95d1130 · 95d1130
2 parents b679853 + 461879f
commit 95d1130
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 39 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.2.3 (2014-09-10)
+
+[FIXED] Wrong encoding of HTTP heartbeats
+
+[FIXED] Missing httpPath parameter for sockjs transport
+
+[FIXED] Auth query strings no longer start with `&`
+
 ## 2.2.2 (2014-06-09)
 
 [CHANGED] Updated the HTTPS CDN URL to `https://js.pusher.com`

diff --git a/JFile b/JFile
@@ -7,7 +7,7 @@ target_dir './dist'
 
 src_dir './src'
 
-version '2.2.2'
+version '2.2.3'
 
 bundle 'pusher.js' do
   license 'pusher-licence.js'

diff --git a/dist/flashfallback.js b/dist/flashfallback.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.2
+ * Pusher JavaScript Library v2.2.3
  * http://pusherapp.com/
  *
  * Copyright 2011, Pusher

diff --git a/dist/flashfallback.min.js b/dist/flashfallback.min.js
diff --git a/dist/pusher.js b/dist/pusher.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.2
+ * Pusher JavaScript Library v2.2.3
  * http://pusher.com/
  *
  * Copyright 2014, Pusher
@@ -626,7 +626,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.2.2';
+  Pusher.VERSION = '2.2.3';
   Pusher.PROTOCOL = 7;
 
   // DEPRECATED: WS connection parameters
@@ -678,7 +678,8 @@
       }]],
       [":def", "sockjs_options", {
         hostUnencrypted: config.httpHost + ":" + config.httpPort,
-        hostEncrypted: config.httpHost + ":" + config.httpsPort
+        hostEncrypted: config.httpHost + ":" + config.httpsPort,
+        httpPath: config.httpPath
       }],
       [":def", "timeouts", {
         loop: true,
@@ -3918,7 +3919,7 @@
 
   Pusher.Channel.Authorizer.prototype = {
     composeQuery: function(socketId) {
-      var query = '&socket_id=' + encodeURIComponent(socketId) +
+      var query = 'socket_id=' + encodeURIComponent(socketId) +
         '&channel_name=' + encodeURIComponent(this.channel.name);
 
       for(var i in this.authOptions.params) {
@@ -3999,6 +4000,7 @@
       script.src = this.options.authEndpoint +
         '?callback=' +
         encodeURIComponent(callback_name) +
+        '&' +
         this.composeQuery(socketId);
 
       var head = document.getElementsByTagName("head")[0] || document.documentElement;

diff --git a/dist/pusher.min.js b/dist/pusher.min.js
diff --git a/dist/xdr.js b/dist/xdr.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.2
+ * Pusher JavaScript Library v2.2.3
  * http://pusher.com/
  *
  * Copyright 2014, Pusher
@@ -346,7 +346,7 @@
       socket.sendRaw("[]");
     },
     sendHeartbeat: function(socket) {
-      socket.sendRaw("h");
+      socket.sendRaw("[]");
     },
     onFinished: function(socket, status) {
       socket.onClose(1006, "Connection interrupted (" + status + ")", false);
@@ -367,7 +367,7 @@
       // next HTTP request will reset server's activity timer
     },
     sendHeartbeat: function(socket) {
-      socket.sendRaw("h");
+      socket.sendRaw("[]");
     },
     onFinished: function(socket, status) {
       if (status === 200) {

diff --git a/dist/xdr.min.js b/dist/xdr.min.js
diff --git a/dist/xhr.js b/dist/xhr.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.2
+ * Pusher JavaScript Library v2.2.3
  * http://pusher.com/
  *
  * Copyright 2014, Pusher
@@ -343,7 +343,7 @@
       socket.sendRaw("[]");
     },
     sendHeartbeat: function(socket) {
-      socket.sendRaw("h");
+      socket.sendRaw("[]");
     },
     onFinished: function(socket, status) {
       socket.onClose(1006, "Connection interrupted (" + status + ")", false);
@@ -364,7 +364,7 @@
       // next HTTP request will reset server's activity timer
     },
     sendHeartbeat: function(socket) {
-      socket.sendRaw("h");
+      socket.sendRaw("[]");
     },
     onFinished: function(socket, status) {
       if (status === 200) {