diff --git a/packages/xen-api/package.json b/packages/xen-api/package.json index 3545271be..247bb0338 100644 --- a/packages/xen-api/package.json +++ b/packages/xen-api/package.json @@ -36,7 +36,7 @@ "debug": "^4.0.1", "event-to-promise": "^0.8.0", "exec-promise": "^0.7.0", - "http-request-plus": "^0.7.0", + "http-request-plus": "^0.7.1", "iterable-backoff": "^0.0.0", "jest-diff": "^23.5.0", "json-rpc-protocol": "^0.13.1", diff --git a/packages/xen-api/src/index.js b/packages/xen-api/src/index.js index e1c1d9002..7c7e570a4 100644 --- a/packages/xen-api/src/index.js +++ b/packages/xen-api/src/index.js @@ -667,13 +667,13 @@ export class Xapi extends EventEmitter { query: 'task_id' in query ? omit(query, 'task_id') : query, }).then( response => { - response.req.abort() + response.cancel() return doRequest() }, error => { let response if (error != null && (response = error.response) != null) { - response.req.abort() + response.cancel() const { headers: { location }, @@ -701,12 +701,12 @@ export class Xapi extends EventEmitter { } if (req.finished) { - req.abort() + response.cancel() return taskResult } return fromEvents(req, ['close', 'finish']).then(() => { - req.abort() + response.cancel() return taskResult }) }) diff --git a/packages/xo-cli/package.json b/packages/xo-cli/package.json index f1571db54..68a1e4907 100644 --- a/packages/xo-cli/package.json +++ b/packages/xo-cli/package.json @@ -33,7 +33,7 @@ "chalk": "^2.2.0", "exec-promise": "^0.7.0", "fs-promise": "^2.0.3", - "http-request-plus": "^0.7.0", + "http-request-plus": "^0.7.1", "human-format": "^0.10.0", "l33teral": "^3.0.3", "lodash": "^4.17.4", diff --git a/packages/xo-server-cloud/package.json b/packages/xo-server-cloud/package.json index 8cf1e1c76..d64ec18a8 100644 --- a/packages/xo-server-cloud/package.json +++ b/packages/xo-server-cloud/package.json @@ -31,7 +31,7 @@ "node": ">=6" }, "dependencies": { - "http-request-plus": "^0.7.0", + "http-request-plus": "^0.7.1", "jsonrpc-websocket-client": "^0.4.1" }, "devDependencies": { diff --git a/packages/xo-server/package.json b/packages/xo-server/package.json index 31a430191..6362eb00b 100644 --- a/packages/xo-server/package.json +++ b/packages/xo-server/package.json @@ -68,7 +68,7 @@ "helmet": "^3.9.0", "highland": "^2.11.1", "http-proxy": "^1.16.2", - "http-request-plus": "^0.7.0", + "http-request-plus": "^0.7.1", "http-server-plus": "^0.10.0", "human-format": "^0.10.0", "is-redirect": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 5e71cda27..632d1ff72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6563,10 +6563,10 @@ http-proxy@^1.16.2: follow-redirects "^1.0.0" requires-port "^1.0.0" -http-request-plus@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/http-request-plus/-/http-request-plus-0.7.0.tgz#da337ede0b4460a51e68182b1e9c887a1df3b86e" - integrity sha512-+LspB7FJ8ZVG6Awh3L0Nkjny4l+DMSrkS0N6T3Q7hzjue/Ig0U/HbMnuxz66rrrFPFi6ZDt+IzrrpkDDCfTiNA== +http-request-plus@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/http-request-plus/-/http-request-plus-0.7.1.tgz#259dd499c0be5ac3ba3ea3d05428e8748a260748" + integrity sha512-/1euyr0znKEB+gQ0JmyYkZVWOgXZtRJcTE4p+Ig26ppaVqymWikz75tHSt+dHPiSgZWpGrpjN+3973KoVzP+AA== dependencies: is-redirect "^1.0.0" lodash "^4.17.4"