Skip to content

Commit 314c14c

Browse files
author
Max Presman
committed
3.14.3
1 parent ab993e9 commit 314c14c

File tree

25 files changed

+68
-35
lines changed

25 files changed

+68
-35
lines changed

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11

2+
3-10-16 * 3.14.3
3+
- add support of passing headers via proxy
4+
25
3-1-16 * 3.14.0
36
- introduction of keychain class to support internal storage of key
47
- refactoring of origin calculations and handling

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ PubNub for JavaScript Docs have been moved to: http://www.pubnub.com/docs/javasc
1313
## CDN Links
1414

1515
#### HTTP
16-
* http://cdn.pubnub.com/pubnub-3.14.2.min.js
17-
* http://cdn.pubnub.com/pubnub-3.14.2.js
16+
* http://cdn.pubnub.com/pubnub-3.14.3.min.js
17+
* http://cdn.pubnub.com/pubnub-3.14.3.js
1818

1919
#### HTTPS
20-
* https://cdn.pubnub.com/pubnub-3.14.2.min.js
21-
* https://cdn.pubnub.com/pubnub-3.14.2.js
20+
* https://cdn.pubnub.com/pubnub-3.14.3.min.js
21+
* https://cdn.pubnub.com/pubnub-3.14.3.js

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.14.2
1+
3.14.3

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pubnub",
3-
"version": "3.14.2",
3+
"version": "3.14.3",
44
"main": "web/dist/pubnub.min.js",
55
"license": "https://github.com/pubnub/javascript/blob/master/LICENSE",
66
"ignore" : [ "**/*", "!web/dist/pubnub.js", "!web/dist/pubnub.min.js", "!web/pubnub.js", "!web/pubnub.min.js"],

modern/dist/pubnub.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 3.14.2 / modern */
1+
/*! 3.14.3 / modern */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -406,7 +406,7 @@ return /******/ (function(modules) { // webpackBootstrap
406406
module.exports = {
407407
"name": "pubnub",
408408
"preferGlobal": false,
409-
"version": "3.14.2",
409+
"version": "3.14.3",
410410
"author": "PubNub <support@pubnub.com>",
411411
"description": "Publish & Subscribe Real-time Messaging with PubNub",
412412
"contributors": [

modern/dist/pubnub.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modern/pubnub.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 3.14.2 / modern */
1+
/*! 3.14.3 / modern */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -406,7 +406,7 @@ return /******/ (function(modules) { // webpackBootstrap
406406
module.exports = {
407407
"name": "pubnub",
408408
"preferGlobal": false,
409-
"version": "3.14.2",
409+
"version": "3.14.3",
410410
"author": "PubNub <support@pubnub.com>",
411411
"description": "Publish & Subscribe Real-time Messaging with PubNub",
412412
"contributors": [

modern/pubnub.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node.js/lib/xdr.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,22 @@ function xdr(PNSDK, proxy, keepaliveEnabled, keepAliveAgent, keepAliveAgentSSL,
108108

109109
var origin = setup.url[0].split('//')[1];
110110

111+
var headers = null;
112+
113+
if (proxy) {
114+
headers = {
115+
Host: origin
116+
};
117+
118+
if (proxy.headers) {
119+
_.extend(headers, proxy.headers);
120+
}
121+
}
122+
111123
options.hostname = proxy ? proxy.hostname : setup.url[0].split('//')[1];
112124
options.port = proxy ? proxy.port : ssl ? 443 : 80;
113125
options.path = proxy ? 'http://' + origin + url : url;
114-
options.headers = proxy ? { Host: origin } : null;
126+
options.headers = headers;
115127
options.method = mode;
116128
options.keepAlive = !!keepaliveEnabled;
117129
options.body = payload;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pubnub",
33
"preferGlobal": false,
4-
"version": "3.14.2",
4+
"version": "3.14.3",
55
"author": "PubNub <support@pubnub.com>",
66
"description": "Publish & Subscribe Real-time Messaging with PubNub",
77
"contributors": [

0 commit comments

Comments
 (0)