From 0f2d7138336288d5a079d3176782e038cc9ac893 Mon Sep 17 00:00:00 2001 From: Stefan Klug Date: Sun, 10 Jan 2016 15:42:19 +0100 Subject: [PATCH 1/3] don't abort request, if not needed because it closes the socket, which prevents usage of Agent.keepAlive --- lib/request.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/request.js b/lib/request.js index ed68cef..ec61ef9 100644 --- a/lib/request.js +++ b/lib/request.js @@ -138,6 +138,7 @@ Request.prototype.saveBuffer = function(callback) { } if (err) { + self.request.abort(); self.error(err, callback); } }); @@ -188,6 +189,7 @@ Request.prototype.saveFile = function(file, callback) { var ws = fs.createWriteStream(file); ws.on('error', function(err) { + self.request.abort(); self.error(err, callback); }); @@ -425,6 +427,7 @@ Request.prototype.send = function(callback) { if (size > 1048576) { err.largeDocument = true; + self.request.abort(); self.error(err, callback); } }); @@ -437,6 +440,7 @@ Request.prototype.send = function(callback) { stream.on('error', function(zErr) { err.noDocument = true; err.message = zErr.message; + self.request.abort(); self.error(err, callback); }); @@ -445,6 +449,7 @@ Request.prototype.send = function(callback) { // catch all error handler default: + self.request.abort(); self.error(tools.formattedError('HTTP Error: %d', response.statusCode), callback); self.response.resume(); break; @@ -537,9 +542,6 @@ Request.prototype.error = function(error, callback) { if (!this.states.error && !this.states.finish) { this.states.error = true; - if (this.request) { - this.request.abort(); - } if (!error.code && this.response) { error.code = this.response.statusCode; From a6a877eb3599b2821fddb5f4d26eec568501fa38 Mon Sep 17 00:00:00 2001 From: Stefan Klug Date: Sun, 28 Oct 2018 19:40:08 +0100 Subject: [PATCH 2/3] Pin direct dependencies to prevent rebuild errors --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8cd8215..0fd87b0 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "node": ">= 0.8.5" }, "dependencies": { - "form-data": ">= 0.1.2", - "mmmagic": ">= 0.3.4" + "form-data": "~0.1.2", + "mmmagic": "~0.3.4" }, "devDependencies": { "mocha": ">= 1.8.2", From ef66ef529faa9d9488c156841619ec567aeda321 Mon Sep 17 00:00:00 2001 From: Stefan Klug Date: Fri, 30 Aug 2024 22:25:02 +0200 Subject: [PATCH 3/3] Upgrade mmmagic to latest version The old mmmagic version gives build errors. Update to newest. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0fd87b0..bef0dd2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "form-data": "~0.1.2", - "mmmagic": "~0.3.4" + "mmmagic": "~0.5.3" }, "devDependencies": { "mocha": ">= 1.8.2", @@ -56,4 +56,4 @@ "scripts": { "test": "make test" } -} \ No newline at end of file +}