[Pkg-javascript-commits] [sockjs-client] 269/350: [dist] 1.0.0-beta.6
tonnerre at ancient-solutions.com
tonnerre at ancient-solutions.com
Fri Aug 5 01:04:29 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 b912ce19a2b0069575848ddfd740a3e0980fc652
Author: Bryce Kahle <bkahle at gmail.com>
Date: Sat Nov 22 14:18:40 2014 -0500
[dist] 1.0.0-beta.6
---
Changelog.md | 5 +++
...ckjs-1.0.0-beta.5.js => sockjs-1.0.0-beta.6.js} | 40 +++++++++++++++-------
....0-beta.5.min.js => sockjs-1.0.0-beta.6.min.js} | 4 +--
lib/version.js | 2 +-
package.json | 4 +--
5 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index 55bac6d..fedbdf9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+1.0.0-beta.6
+====
+
+ * Upgrade `url-parse` to 0.1.3 to avoid CSP issues
+
1.0.0-beta.5
=====
diff --git a/dist/sockjs-1.0.0-beta.5.js b/dist/sockjs-1.0.0-beta.6.js
similarity index 99%
rename from dist/sockjs-1.0.0-beta.5.js
rename to dist/sockjs-1.0.0-beta.6.js
index be9583f..7fa4016 100755
--- a/dist/sockjs-1.0.0-beta.5.js
+++ b/dist/sockjs-1.0.0-beta.6.js
@@ -1,4 +1,4 @@
-/* sockjs-client v1.0.0-beta.5 | http://sockjs.org | MIT license */
+/* sockjs-client v1.0.0-beta.6 | http://sockjs.org | MIT license */
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.SockJS=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot fin [...]
(function (global){
'use strict';
@@ -3626,7 +3626,7 @@ module.exports = {
}).call(this,{ env: {} })
},{"debug":53,"url-parse":58}],52:[function(require,module,exports){
-module.exports = '1.0.0-beta.5';
+module.exports = '1.0.0-beta.6';
},{}],53:[function(require,module,exports){
/**
@@ -5045,7 +5045,9 @@ var regexp = /^(?:(?:(([^:\/#\?]+:)?(?:(?:\/\/)(?:(?:(?:([^:@\/#\?]+)(?:\:([^:@\
* @api public
*/
function URL(address, location, parser) {
- if (!(this instanceof URL)) return new URL(address, location, parser);
+ if (!(this instanceof URL)) {
+ return new URL(address, location, parser);
+ }
//
// The following if statements allows this module two have compatibility with
@@ -5058,8 +5060,16 @@ function URL(address, location, parser) {
// arguments. The supplied object will be used as default values / fall-back
// for relative paths.
//
- if ('object' !== typeof location) { parser = location; location = null; }
- if (parser && 'function' !== typeof parser) parser = qs.parse;
+ var type = typeof location;
+
+ if ('object' !== type && 'string' !== type) {
+ parser = location;
+ location = null;
+ }
+
+ if (parser && 'function' !== typeof parser) {
+ parser = qs.parse;
+ }
location = lolcation(location);
@@ -5138,6 +5148,7 @@ URL.qs = qs;
module.exports = URL;
},{"./lolcation":59,"querystringify":60,"requires-port":61}],59:[function(require,module,exports){
+(function (global){
'use strict';
/**
@@ -5159,27 +5170,32 @@ var ignore = { hash: 1, query: 1 }
* encoded in the `pathname` so we can thankfully generate a good "default"
* location from it so we can generate proper relative URL's again.
*
- * @param {Object} location Optional default location object.
+ * @param {Object} loc Optional default location object.
* @returns {Object} lolcation object.
* @api public
*/
-module.exports = function lolcation(location) {
- location = location || (new Function('return this.location'))() || {};
+module.exports = function lolcation(loc) {
+ loc = loc || global.location || {};
URL = URL || require('./');
var finaldestination = {}
+ , type = typeof loc
, key;
- if ('blob:' === location.protocol) {
- finaldestination = new URL(unescape(location.pathname));
- } else for (key in location) {
+ if ('blob:' === loc.protocol) {
+ finaldestination = new URL(unescape(loc.pathname), {});
+ } else if ('string' === type) {
+ finaldestination = new URL(loc, {});
+ for (key in ignore) delete finaldestination[key];
+ } else if ('object' === type) for (key in loc) {
if (key in ignore) continue;
- finaldestination[key] = location[key];
+ finaldestination[key] = loc[key];
}
return finaldestination;
};
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./":58}],60:[function(require,module,exports){
'use strict';
diff --git a/dist/sockjs-1.0.0-beta.5.min.js b/dist/sockjs-1.0.0-beta.6.min.js
similarity index 95%
rename from dist/sockjs-1.0.0-beta.5.min.js
rename to dist/sockjs-1.0.0-beta.6.min.js
index d7bbc37..db188d8 100755
--- a/dist/sockjs-1.0.0-beta.5.min.js
+++ b/dist/sockjs-1.0.0-beta.6.min.js
@@ -1,3 +1,3 @@
-/* sockjs-client v1.0.0-beta.5 | http://sockjs.org | MIT license */
+/* sockjs-client v1.0.0-beta.6 | http://sockjs.org | MIT license */
!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.SockJS=t()}}(function(){var t;return function e(t,n,r){function i(s,a){if(!n[s]){if(!t[s]){var u="function"==typeof require&&require;if(!a&&u)return u(s,!0);if(o)return o(s,!0);var l=new Error("Cannot find module '"+s+"'");th [...]
-},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":49,"../../utils/url":51,debug:void 0,events:3,inherits:53}],32:[function(t,e){"use strict";function n(t,e){i.call(this);var n=this;this.bufferPosition=0,this.xo=new e("POST",t,null),this.xo.on("chunk",this._chunkHandler.bind(this)),this.xo.once("finish",function(t,e){n._chunkHandler(t,e),n.xo=null;var r=200===t?"network":"permanent";n.emit("close",null,r),n._cleanup()})}var r=t("inherits"),i=t("events").EventEmitter [...]
\ No newline at end of file
+},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":49,"../../utils/url":51,debug:void 0,events:3,inherits:53}],32:[function(t,e){"use strict";function n(t,e){i.call(this);var n=this;this.bufferPosition=0,this.xo=new e("POST",t,null),this.xo.on("chunk",this._chunkHandler.bind(this)),this.xo.once("finish",function(t,e){n._chunkHandler(t,e),n.xo=null;var r=200===t?"network":"permanent";n.emit("close",null,r),n._cleanup()})}var r=t("inherits"),i=t("events").EventEmitter [...]
\ No newline at end of file
diff --git a/lib/version.js b/lib/version.js
index f3a6818..fc62300 100644
--- a/lib/version.js
+++ b/lib/version.js
@@ -1 +1 @@
-module.exports = '1.0.0-beta.5';
\ No newline at end of file
+module.exports = '1.0.0-beta.6';
\ No newline at end of file
diff --git a/package.json b/package.json
index ae272f6..2309c80 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "sockjs-client",
"description": "SockJS-client is a browser JavaScript library that provides a WebSocket-like object. SockJS gives you a coherent, cross-browser, Javascript API which creates a low latency, full duplex, cross-domain communication channel between the browser and the web server.",
- "version": "1.0.0-beta.5",
+ "version": "1.0.0-beta.6",
"author": "Bryce Kahle",
"browser": {
"./lib/transport/driver/websocket.js": "./lib/transport/browser/websocket.js",
@@ -29,7 +29,7 @@
"faye-websocket": "~0.7.3",
"inherits": "^2.0.1",
"json3": "^3.3.2",
- "url-parse": "^0.1.1"
+ "url-parse": "^0.1.3"
},
"devDependencies": {
"browserify": "^6.1.0",
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/sockjs-client.git
More information about the Pkg-javascript-commits
mailing list