Support maxRedirects in URLConnections.checkFollowRedirect(...), re #11

libj · Jun 11, 2023 · a8d99d7 · a8d99d7
1 parent 107a983
commit a8d99d7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/libj/net/URLConnections.java b/src/main/java/org/libj/net/URLConnections.java
@@ -105,13 +105,13 @@ public static URLConnection checkFollowRedirect(URLConnection connection, final
         beforeConnect.accept(httpURLConnection);
 
       status = httpURLConnection.getResponseCode();
-      if (status < HttpURLConnection.HTTP_MOVED_PERM || HttpURLConnection.HTTP_SEE_OTHER < status)
+      if (status < HttpURLConnection.HTTP_MOVED_PERM || HttpURLConnection.HTTP_SEE_OTHER < status || 1 == maxRedirects)
         return connection;
 
       final LinkedHashSet<String> visited = new LinkedHashSet<>();
       visited.add(location0);
       visited.add(location);
-      do {
+      int i = 1; do {
         location = httpURLConnection.getHeaderField("Location");
         if (!visited.add(location))
           throw new IOException("Infinite redirection loop: " + visited.stream().collect(Collectors.joining(" -> ")) + " -> " + location);
@@ -126,7 +126,7 @@ public static URLConnection checkFollowRedirect(URLConnection connection, final
           beforeConnect.accept(httpURLConnection);
 
         status = httpURLConnection.getResponseCode();
-        if (status < HttpURLConnection.HTTP_MOVED_PERM || HttpURLConnection.HTTP_SEE_OTHER < status)
+        if (status < HttpURLConnection.HTTP_MOVED_PERM || HttpURLConnection.HTTP_SEE_OTHER < status || ++i == maxRedirects)
           return connection;
       }
       while (true);