Moved redirect header loop to a separate function

codeigniter4 · Jan 21, 2025 · a9c9284 · a9c9284
1 parent a106b18
commit a9c9284
Showing 1 changed file with 27 additions and 20 deletions.
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -385,27 +385,8 @@ public function send(string $method, string $url)
         // Set the string we want to break our response from
         $breakString = "\r\n\r\n";
 
-        // Strip out multiple redirect header sections
         if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
-            while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
-                $breakStringPos        = strpos($output, $breakString);
-                $redirectHeaderSection = substr($output, 0, $breakStringPos);
-                $redirectHeaders       = explode("\n", $redirectHeaderSection);
-                $locationHeaderFound   = false;
-
-                foreach ($redirectHeaders as $header) {
-                    if (str_starts_with(strtolower($header), 'location:')) {
-                        $locationHeaderFound = true;
-                        break;
-                    }
-                }
-
-                if ($locationHeaderFound) {
-                    $output = substr($output, $breakStringPos + 4);
-                } else {
-                    break;
-                }
-            }
+            $output = $this->handleRedirectHeaders($output, $breakString);
         }
 
         while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
@@ -736,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string
 
         return $output;
     }
+
+    private function handleRedirectHeaders(string $output, string $breakString): string
+    {
+        // Strip out multiple redirect header sections
+        while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
+            $breakStringPos        = strpos($output, $breakString);
+            $redirectHeaderSection = substr($output, 0, $breakStringPos);
+            $redirectHeaders       = explode("\n", $redirectHeaderSection);
+            $locationHeaderFound   = false;
+
+            foreach ($redirectHeaders as $header) {
+                if (str_starts_with(strtolower($header), 'location:')) {
+                    $locationHeaderFound = true;
+                    break;
+                }
+            }
+
+            if ($locationHeaderFound) {
+                $output = substr($output, $breakStringPos + 4);
+            } else {
+                break;
+            }
+        }
+
+        return $output;
+    }
 }