3.14.3

cursesun · Mar 10, 2016 · 314c14c · 314c14c
1 parent ab993e9
commit 314c14c
Show file tree

Hide file tree

Showing 25 changed files with 68 additions and 35 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,7 @@
 
+3-10-16 * 3.14.3
+ - add support of passing headers via proxy
+
 3-1-16 * 3.14.0
  - introduction of keychain class to support internal storage of key
  - refactoring of origin calculations and handling

diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@ PubNub for JavaScript Docs have been moved to: http://www.pubnub.com/docs/javasc
 ## CDN Links
 
 #### HTTP
-* http://cdn.pubnub.com/pubnub-3.14.2.min.js
-* http://cdn.pubnub.com/pubnub-3.14.2.js
+* http://cdn.pubnub.com/pubnub-3.14.3.min.js
+* http://cdn.pubnub.com/pubnub-3.14.3.js
 
 #### HTTPS
-* https://cdn.pubnub.com/pubnub-3.14.2.min.js
-* https://cdn.pubnub.com/pubnub-3.14.2.js
+* https://cdn.pubnub.com/pubnub-3.14.3.min.js
+* https://cdn.pubnub.com/pubnub-3.14.3.js
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.14.2
+3.14.3
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "3.14.2",
+  "version": "3.14.3",
   "main": "web/dist/pubnub.min.js",
   "license": "https://github.com/pubnub/javascript/blob/master/LICENSE",
   "ignore" : [ "**/*", "!web/dist/pubnub.js", "!web/dist/pubnub.min.js", "!web/pubnub.js", "!web/pubnub.min.js"],

diff --git a/modern/dist/pubnub.js b/modern/dist/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / modern */
+/*! 3.14.3 / modern */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -406,7 +406,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/modern/dist/pubnub.min.js b/modern/dist/pubnub.min.js
diff --git a/modern/pubnub.js b/modern/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / modern */
+/*! 3.14.3 / modern */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -406,7 +406,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/modern/pubnub.min.js b/modern/pubnub.min.js
diff --git a/node.js/lib/xdr.js b/node.js/lib/xdr.js
@@ -108,10 +108,22 @@ function xdr(PNSDK, proxy, keepaliveEnabled, keepAliveAgent, keepAliveAgentSSL,
 
   var origin = setup.url[0].split('//')[1];
 
+  var headers = null;
+
+  if (proxy) {
+    headers = {
+      Host: origin
+    };
+
+    if (proxy.headers) {
+      _.extend(headers, proxy.headers);
+    }
+  }
+
   options.hostname = proxy ? proxy.hostname : setup.url[0].split('//')[1];
   options.port = proxy ? proxy.port : ssl ? 443 : 80;
   options.path = proxy ? 'http://' + origin + url : url;
-  options.headers = proxy ? { Host: origin } : null;
+  options.headers = headers;
   options.method = mode;
   options.keepAlive = !!keepaliveEnabled;
   options.body = payload;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pubnub",
   "preferGlobal": false,
-  "version": "3.14.2",
+  "version": "3.14.3",
   "author": "PubNub <support@pubnub.com>",
   "description": "Publish & Subscribe Real-time Messaging with PubNub",
   "contributors": [

diff --git a/parse/dist/pubnub.js b/parse/dist/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / parse */
+/*! 3.14.3 / parse */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("crypto"), require("buffer"));
@@ -288,7 +288,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/parse/dist/pubnub.min.js b/parse/dist/pubnub.min.js
diff --git a/phonegap/dist/pubnub.js b/phonegap/dist/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / phonegap */
+/*! 3.14.3 / phonegap */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -406,7 +406,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/phonegap/dist/pubnub.min.js b/phonegap/dist/pubnub.min.js
diff --git a/sencha/dist/pubnub.js b/sencha/dist/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / sencha */
+/*! 3.14.3 / sencha */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -406,7 +406,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/sencha/dist/pubnub.min.js b/sencha/dist/pubnub.min.js
diff --git a/test/server/unit/impl/node.js/xdr.test.js b/test/server/unit/impl/node.js/xdr.test.js
@@ -161,5 +161,23 @@ describe('#xdr', function () {
         body: ''
       });
     });
+
+    it('support additional headers', function () {
+      var proxy = { hostname: 'moose.com', port: 1337, headers: { h1: 'header1', h2: 'header2' } };
+      var xdrInstance = XDR.createInstance('testing1', proxy, false);
+      var xdrSetup = { data: {}, ssl: true, url: ['https://pubsub.pubnub.com', 'time', 0] };
+
+      xdrInstance.request(xdrSetup);
+
+      assert.deepEqual(httpsMock.args[0][0], {
+        hostname: 'moose.com',
+        port: 1337,
+        path: 'http://pubsub.pubnub.com/time/0?pnsdk=testing1',
+        headers: { Host: 'pubsub.pubnub.com', h1: 'header1', h2: 'header2' },
+        method: 'GET',
+        keepAlive: false,
+        body: ''
+      });
+    });
   });
 });
diff --git a/titanium/dist/pubnub.js b/titanium/dist/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / titanium */
+/*! 3.14.3 / titanium */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -685,7 +685,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/titanium/dist/pubnub.min.js b/titanium/dist/pubnub.min.js
diff --git a/web/dist/pubnub.js b/web/dist/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / web */
+/*! 3.14.3 / web */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -804,7 +804,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/web/dist/pubnub.min.js b/web/dist/pubnub.min.js
diff --git a/web/pubnub.js b/web/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / web */
+/*! 3.14.3 / web */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -804,7 +804,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/web/pubnub.min.js b/web/pubnub.min.js
diff --git a/webos/dist/pubnub.js b/webos/dist/pubnub.js
@@ -1,4 +1,4 @@
-/*! 3.14.2 / webos */
+/*! 3.14.3 / webos */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -406,7 +406,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = {
 		"name": "pubnub",
 		"preferGlobal": false,
-		"version": "3.14.2",
+		"version": "3.14.3",
 		"author": "PubNub <support@pubnub.com>",
 		"description": "Publish & Subscribe Real-time Messaging with PubNub",
 		"contributors": [

diff --git a/webos/dist/pubnub.min.js b/webos/dist/pubnub.min.js