Merge pull request aws#844 from jeskew/fix/only-check-for-reverse-slo…

…wloris-responses-on-400s Ensure errors with unparseable responses are retried when idempotent
rohjay · Dec 11, 2015 · 9fee106 · 9fee106
2 parents 3ac0213 + b31dbcc
commit 9fee106
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/S3/S3Client.php b/src/S3/S3Client.php
@@ -749,7 +749,10 @@ public static function _applyRetryConfig($value, $_, HandlerList $list)
             } elseif ($error instanceof AwsException
                 && $retries < $maxRetries
             ) {
-                if ($error->getResponse()) {
+                if (
+                    $error->getResponse()
+                    && $error->getResponse()->getStatusCode() >= 400
+                ) {
                     return strpos(
                         $error->getResponse()->getBody(),
                         'Your socket connection to the server'

diff --git a/tests/S3/S3ClientTest.php b/tests/S3/S3ClientTest.php
@@ -755,4 +755,37 @@ public function testNetworkingErrorsAreNotRetriedOnNonIdempotentCommands()
 
         $this->assertEquals(0, $retries);
     }
+
+    public function testErrorsWithUnparseableBodiesCanBeRetried()
+    {
+        $networkingError = $this->getMockBuilder(RequestException::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $retries = 11;
+        $client = new S3Client([
+            'version' => 'latest',
+            'region' => 'us-west-2',
+            'retries' => $retries,
+            'http_handler' => function () use (&$retries, $networkingError) {
+                if (0 === --$retries) {
+                    return new FulfilledPromise(new Response);
+                }
+
+                return new RejectedPromise([
+                    'connection_error' => false,
+                    'exception' => $networkingError,
+                    'response' => new Response(200, [], openssl_random_pseudo_bytes(2048)),
+                ]);
+            },
+        ]);
+
+        $client->getObject([
+            'Bucket' => 'bucket',
+            'Key' => 'key',
+        ]);
+
+        $this->assertEquals(0, $retries);
+    }
 }