ensure existing content-length headers are not overwritten and ignore negative results from stream getSize in HttplugClient and Psr18Client

KurtThiemann · KurtThiemann · commit 5ed994bf28d2 · 2024-11-13T19:25:58.000+01:00
diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php
@@ -230,7 +230,7 @@ private function sendPsr7Request(RequestInterface $request, ?bool $buffer = null
             }
 
             $headers = $request->getHeaders();
-            if (($size = $body->getSize()) !== null) {
+            if (!$request->hasHeader('content-length') && 0 <= $size = $body->getSize() ?? -1) {
                 $headers['Content-Length'] = [$size];
             }
 
diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php
@@ -94,7 +94,7 @@ public function sendRequest(RequestInterface $request): ResponseInterface
             }
 
             $headers = $request->getHeaders();
-            if (($size = $body->getSize()) !== null) {
+            if (!$request->hasHeader('content-length') && 0 <= $size = $body->getSize() ?? -1) {
                 $headers['Content-Length'] = [$size];
             }
 

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ private function sendPsr7Request(RequestInterface $request, ?bool $buffer = null`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`$headers = $request->getHeaders();`
`233`		`- if (($size = $body->getSize()) !== null) {`
	`233`	`+ if (!$request->hasHeader('content-length') && 0 <= $size = $body->getSize() ?? -1) {`
`234`	`234`	`$headers['Content-Length'] = [$size];`
`235`	`235`	`}`
`236`	`236`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function sendRequest(RequestInterface $request): ResponseInterface`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`$headers = $request->getHeaders();`
`97`		`- if (($size = $body->getSize()) !== null) {`
	`97`	`+ if (!$request->hasHeader('content-length') && 0 <= $size = $body->getSize() ?? -1) {`
`98`	`98`	`$headers['Content-Length'] = [$size];`
`99`	`99`	`}`
`100`	`100`