Refine redirect limit handling

Author: gaby

client/transport.go

@@ -271,35 +271,9 @@ type redirectClient interface {
 func doRedirectsWithClient(req *fasthttp.Request, resp *fasthttp.Response, maxRedirects int, client redirectClient) error {
 	currentURL := req.URI().String()
 	redirects := 0
+	originalLimit := maxRedirects
 
-	if maxRedirects <= 0 {
-		req.SetRequestURI(currentURL)
-		if err := client.Do(req, resp); err != nil {
-			return err
-		}
-
-		statusCode := resp.Header.StatusCode()
-		if !fasthttp.StatusCodeIsRedirect(statusCode) || maxRedirects == 0 {
-			return nil
-		}
-
-		location := resp.Header.Peek("Location")
-		if len(location) == 0 {
-			return fasthttp.ErrMissingLocation
-		}
-
-		nextURL, err := composeRedirectURL(currentURL, location, req.DisableRedirectPathNormalizing)
-		if err != nil {
-			return err
-		}
-		currentURL = nextURL
-		redirects = 1
-
-		if req.Header.IsPost() && (statusCode == fasthttp.StatusMovedPermanently || statusCode == fasthttp.StatusFound) {
-			req.Header.SetMethod(fasthttp.MethodGet)
-			req.SetBody(nil)
-		}
-
+	if maxRedirects < 0 {
 		maxRedirects = defaultRedirectLimit
 	}
 
@@ -315,6 +289,10 @@ func doRedirectsWithClient(req *fasthttp.Request, resp *fasthttp.Response, maxRe
 			return nil
 		}
 
+		if originalLimit == 0 {
+			return nil
+		}
+
 		redirects++
 		if redirects > maxRedirects {
 			return fasthttp.ErrTooManyRedirects