follow-redirects 1.5.4 → 1.5.8

package/index.js

@@ -58,9 +58,15 @@ RedirectableRequest.prototype = Object.create(Writable.prototype);
 
 // Writes buffered data to the current native request
 RedirectableRequest.prototype.write = function (data, encoding, callback) {
+  // Validate input and shift parameters if necessary
   if (!(typeof data === "string" || typeof data === "object" && ("length" in data))) {
     throw new Error("data should be a string, Buffer or Uint8Array");
   }
+  if (typeof encoding === "function") {
+    callback = encoding;
+    encoding = null;
+  }
+
   // Ignore empty buffers, since writing them doesn't invoke the callback
   // https://github.com/nodejs/node/issues/22066
   if (data.length === 0) {
@@ -84,15 +90,21 @@ RedirectableRequest.prototype.write = function (data, encoding, callback) {
 
 // Ends the current native request
 RedirectableRequest.prototype.end = function (data, encoding, callback) {
-  var currentRequest = this._currentRequest;
-  if (!data) {
-    currentRequest.end(null, null, callback);
+  // Shift parameters if necessary
+  if (typeof data === "function") {
+    callback = data;
+    data = encoding = null;
   }
-  else {
-    this.write(data, encoding, function () {
-      currentRequest.end(null, null, callback);
-    });
+  else if (typeof encoding === "function") {
+    callback = encoding;
+    encoding = null;
   }
+
+  // Write data and end
+  var currentRequest = this._currentRequest;
+  this.write(data || "", encoding, function () {
+    currentRequest.end(null, null, callback);
+  });
 };
 
 // Sets a header value on the current native request
@@ -129,6 +141,10 @@ RedirectableRequest.prototype._performRequest = function () {
   // Load the native protocol
   var protocol = this._options.protocol;
   var nativeProtocol = this._options.nativeProtocols[protocol];
+  if (!nativeProtocol) {
+    this.emit("error", new Error("Unsupported protocol " + protocol));
+    return;
+  }
 
   // If specified, use the agent corresponding to the protocol
   // (HTTP and HTTPS use different types of agents)
@@ -155,10 +171,11 @@ RedirectableRequest.prototype._performRequest = function () {
   // (The first request must be ended explicitly with RedirectableRequest#end)
   if (this._isRedirect) {
     // Write the request entity and end.
-    var requestBodyBuffers = this._requestBodyBuffers;
+    var i = 0;
+    var buffers = this._requestBodyBuffers;
     (function writeNext() {
-      if (requestBodyBuffers.length !== 0) {
-        var buffer = requestBodyBuffers.shift();
+      if (i < buffers.length) {
+        var buffer = buffers[i++];
         request.write(buffer.data, buffer.encoding, writeNext);
       }
       else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "follow-redirects",
-  "version": "1.5.4",
+  "version": "1.5.8",
   "description": "HTTP and HTTPS modules that follow redirects.",
   "main": "index.js",
   "engines": {
@@ -44,7 +44,7 @@
     "https.js"
   ],
   "dependencies": {
-    "debug": "^3.1.0"
+    "debug": "=3.1.0"
   },
   "devDependencies": {
     "bluebird": "^3.5.1",