Fix retry handling of connection exception (#41811)

gdebrauwer · web-flow · commit bb071a97b4cc · 2022-04-03T11:44:23.000-05:00
diff --git a/src/Illuminate/Http/Client/PendingRequest.php b/src/Illuminate/Http/Client/PendingRequest.php
@@ -708,7 +708,7 @@ public function send(string $method, string $url, array $options = [])
             return $this->makePromise($method, $url, $options);
         }
 
-        $shouldRetry = true;
+        $shouldRetry = null;
 
         return retry($this->tries ?? 1, function ($attempt) use ($method, $url, $options, &$shouldRetry) {
             try {
@@ -740,8 +740,12 @@ public function send(string $method, string $url, array $options = [])
 
                 throw new ConnectionException($e->getMessage(), 0, $e);
             }
-        }, $this->retryDelay ?? 100, function () use (&$shouldRetry) {
-            return $shouldRetry;
+        }, $this->retryDelay ?? 100, function ($exception) use (&$shouldRetry) {
+            $result = $shouldRetry ?? ($this->retryWhenCallback ? call_user_func($this->retryWhenCallback, $exception, $this) : true);
+
+            $shouldRetry = null;
+
+            return $result;
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ public function send(string $method, string $url, array $options = [])`
`708`	`708`	`return $this->makePromise($method, $url, $options);`
`709`	`709`	`}`
`710`	`710`
`711`		`- $shouldRetry = true;`
	`711`	`+ $shouldRetry = null;`
`712`	`712`
`713`	`713`	`return retry($this->tries ?? 1, function ($attempt) use ($method, $url, $options, &$shouldRetry) {`
`714`	`714`	`try {`
`@@ -740,8 +740,12 @@ public function send(string $method, string $url, array $options = [])`
`740`	`740`
`741`	`741`	`throw new ConnectionException($e->getMessage(), 0, $e);`
`742`	`742`	`}`
`743`		`- }, $this->retryDelay ?? 100, function () use (&$shouldRetry) {`
`744`		`- return $shouldRetry;`
	`743`	`+ }, $this->retryDelay ?? 100, function ($exception) use (&$shouldRetry) {`
	`744`	`+ $result = $shouldRetry ?? ($this->retryWhenCallback ? call_user_func($this->retryWhenCallback, $exception, $this) : true);`
	`745`	`+`
	`746`	`+ $shouldRetry = null;`
	`747`	`+`
	`748`	`+ return $result;`
`745`	`749`	`});`
`746`	`750`	`}`
`747`	`751`