Comparing version 4.14.0 to 4.14.1
@@ -169,2 +169,3 @@ "use strict"; | ||
this.options = {}; | ||
let isTls = false; | ||
for (var i = 0; i < arguments.length; ++i) { | ||
@@ -180,2 +181,5 @@ var arg = arguments[i]; | ||
lodash_1.defaults(this.options, utils_1.parseURL(arg)); | ||
if (arg.startsWith("rediss://")) { | ||
isTls = true; | ||
} | ||
} | ||
@@ -189,2 +193,5 @@ else if (typeof arg === "number") { | ||
} | ||
if (isTls) { | ||
lodash_1.defaults(this.options, { tls: true }); | ||
} | ||
lodash_1.defaults(this.options, Redis.defaultOptions); | ||
@@ -191,0 +198,0 @@ if (typeof this.options.port === "string") { |
@@ -277,5 +277,2 @@ "use strict"; | ||
} | ||
if (parsed.protocol === "rediss:") { | ||
result.tls = true; | ||
} | ||
lodash_1.defaults(result, parsed.query); | ||
@@ -282,0 +279,0 @@ return result; |
@@ -0,1 +1,8 @@ | ||
## [4.14.1](https://github.com/luin/ioredis/compare/v4.14.0...v4.14.1) (2019-08-27) | ||
### Bug Fixes | ||
* don’t clobber passed-in tls options with rediss:/ URLs ([#949](https://github.com/luin/ioredis/issues/949)) ([ceefcfa](https://github.com/luin/ioredis/commit/ceefcfa)), closes [#942](https://github.com/luin/ioredis/issues/942) [#940](https://github.com/luin/ioredis/issues/940) [#950](https://github.com/luin/ioredis/issues/950) [#948](https://github.com/luin/ioredis/issues/948) | ||
# [4.14.0](https://github.com/luin/ioredis/compare/v4.13.1...v4.14.0) (2019-07-31) | ||
@@ -2,0 +9,0 @@ |
{ | ||
"name": "ioredis", | ||
"version": "4.14.0", | ||
"version": "4.14.1", | ||
"description": "A robust, performance-focused and full-featured Redis client for Node.js.", | ||
@@ -5,0 +5,0 @@ "main": "built/index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
239629
4186