got 5.5.1 → 5.6.0

package/index.js

@@ -36,7 +36,7 @@ function requestAsEventEmitter(opts) {
 		var req = fn.request(opts, function (res) {
 			var statusCode = res.statusCode;
 
-			if (isRedirect(statusCode) && 'location' in res.headers && (opts.method === 'GET' || opts.method === 'HEAD')) {
+			if (isRedirect(statusCode) && opts.followRedirect && 'location' in res.headers && (opts.method === 'GET' || opts.method === 'HEAD')) {
 				res.resume();
 
 				if (++redirectCount > 10) {
@@ -96,13 +96,14 @@ function asCallback(opts, cb) {
 	ee.on('response', function (res) {
 		readAllStream(res, opts.encoding, function (err, data) {
 			var statusCode = res.statusCode;
+			var limitStatusCode = opts.followRedirect ? 299 : 399;
 
 			if (err) {
 				cb(new got.ReadError(err, opts), null, res);
 				return;
 			}
 
-			if (statusCode < 200 || statusCode > 299) {
+			if (statusCode < 200 || statusCode > limitStatusCode) {
 				err = new got.HTTPError(statusCode, opts);
 			}
 
@@ -183,10 +184,11 @@ function asStream(opts) {
 
 	ee.on('response', function (res) {
 		var statusCode = res.statusCode;
+		var limitStatusCode = opts.followRedirect ? 299 : 399;
 
 		res.pipe(output);
 
-		if (statusCode < 200 || statusCode > 299) {
+		if (statusCode < 200 || statusCode > limitStatusCode) {
 			proxy.emit('error', new got.HTTPError(statusCode, opts), null, res);
 			return;
 		}
@@ -286,6 +288,10 @@ function normalizeArguments(url, opts) {
 		};
 	}
 
+	if (opts.followRedirect === undefined) {
+		opts.followRedirect = true;
+	}
+
 	return opts;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "got",
-  "version": "5.5.1",
+  "version": "5.6.0",
   "description": "Simplified HTTP/HTTPS requests",
   "license": "MIT",
   "repository": "sindresorhus/got",

package/readme.md

@@ -121,12 +121,19 @@ Milliseconds after which the request will be aborted and an error event with `ET
 Type: `number`, `function`  
 Default: `5`
 
-Number of request retries when network errors happens. Delays between retries counts with function `Math.pow(2, retry) + Math.random() * 100`, where `retry` is attempt number (starts from 0).
-
-**Note:** `ENOTFOUND` and `ENETUNREACH` error will not be retried (see full list in [`is-retry-allowed`](https://github.com/floatdrop/is-retry-allowed/blob/master/index.js#L12) module).
+Number of request retries when network errors happens. Delays between retries counts with function `1000 * Math.pow(2, retry) + Math.random() * 100`, where `retry` is attempt number (starts from 0).
 
 Option accepts `function` with `retry` and `error` arguments. Function must return delay in milliseconds (`0` return value cancels retry).
 
+**Note:** if `retries` is `number`, `ENOTFOUND` and `ENETUNREACH` error will not be retried (see full list in [`is-retry-allowed`](https://github.com/floatdrop/is-retry-allowed/blob/master/index.js#L12) module).
+
+###### followRedirect
+
+Type: `boolean`  
+Default: `true`
+
+Defines if redirect responses should be followed automatically.
+
 ##### callback(error, data, response)
 
 Function to be called when error or data are received. If omitted, a promise will be returned.
@@ -135,8 +142,6 @@ Function to be called when error or data are received. If omitted, a promise wil
 
 `Error` object with HTTP status code as `statusCode` property.
 
-###### data
-
 The data you requested.
 
 ###### response