Skip to content

Commit 3c0a55a

Browse files
Merge branch '6.4' into 7.3
* 6.4: [HttpClient] Fix redirects config with amphp Keep body size limit for AMP redirects
2 parents 439032b + c9e69c1 commit 3c0a55a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Response/AmpResponseV4.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,10 @@ private static function followRedirects(Request $originRequest, AmpClientStateV4
331331
$request->setTcpConnectTimeout($originRequest->getTcpConnectTimeout());
332332
$request->setTlsHandshakeTimeout($originRequest->getTlsHandshakeTimeout());
333333
$request->setTransferTimeout($originRequest->getTransferTimeout());
334+
$request->setBodySizeLimit(0);
335+
if (method_exists($request, 'setInactivityTimeout')) {
336+
$request->setInactivityTimeout(0);
337+
}
334338

335339
if (303 === $status || \in_array($status, [301, 302], true) && 'POST' === $response->getRequest()->getMethod()) {
336340
// Do like curl and browsers: turn POST to GET on 301, 302 and 303

Response/AmpResponseV5.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,10 @@ private static function followRedirects(Request $originRequest, AmpClientStateV5
327327
$request->setTcpConnectTimeout($originRequest->getTcpConnectTimeout());
328328
$request->setTlsHandshakeTimeout($originRequest->getTlsHandshakeTimeout());
329329
$request->setTransferTimeout($originRequest->getTransferTimeout());
330+
$request->setBodySizeLimit(0);
331+
if (method_exists($request, 'setInactivityTimeout')) {
332+
$request->setInactivityTimeout(0);
333+
}
330334

331335
if (\in_array($status, [301, 302, 303], true)) {
332336
$originRequest->removeHeader('transfer-encoding');

0 commit comments

Comments
 (0)