Skip to content

Commit fe0063e

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: Typos In Comments typo s/retrieveing/retrieving Typos on 6.0 branch remove duplicated catch block s/<\br>/<br> [HttpClient] Fix retrying requests when the content is used by the strategy
2 parents 251b6f2 + f339e92 commit fe0063e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/HttpCache/HttpCacheTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ public function testDegradationWhenCacheLocked()
692692

693693
$this->cacheConfig['stale_while_revalidate'] = 10;
694694

695-
// The prescence of Last-Modified makes this cacheable (because Response::isValidateable() then).
695+
// The presence of Last-Modified makes this cacheable (because Response::isValidateable() then).
696696
$this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=5', 'Last-Modified' => 'some while ago'], 'Old response');
697697
$this->request('GET', '/'); // warm the cache
698698

0 commit comments

Comments
 (0)