Unpipe lengthAccumulator to prevent 'write after end' error (#1549)

* lengthAccumulator responsible for 'write after end' error * Added a unit test for connection timeout
aws · Jul 6, 2017 · e58d798 · e58d798
1 parent 17b15f4
commit e58d798
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/request.js b/lib/request.js
@@ -635,6 +635,7 @@ AWS.Request = inherit({
             lengthAccumulator.on('end', checkContentLengthAndEmit);
             stream.on('error', function(err) {
               shouldCheckContentLength = false;
+              httpStream.unpipe(lengthAccumulator);
               lengthAccumulator.emit('end');
               lengthAccumulator.end();
             });

diff --git a/test/request.spec.js b/test/request.spec.js
@@ -1147,6 +1147,25 @@ describe('AWS.Request', function() {
 
         // s.resume();
       });
+
+      it('successfully handles connection timeout', function (done) {
+        var request, s;
+        app = function (req, resp) {
+          resp.writeHead(200, {
+            'content-length': 512 * 1024
+          });
+          resp.write(new Buffer(512 * 1024));
+          resp.end();
+        };
+        service.config.httpOptions.timeout = 5;
+        request = service.makeRequest('mockMethod');
+        s = request.createReadStream();
+        s.on('error', function (e) {
+          setImmediate(function () {
+            done();
+          });
+        });
+      });
     });
   }