do not lose response information when truncating the debug buffer

xabbuh · xabbuh · commit 7d5c65265418 · 2025-04-28T23:16:37.000+02:00
diff --git a/Response/CurlResponse.php b/Response/CurlResponse.php
@@ -205,7 +205,6 @@ public function getInfo(?string $type = null): mixed
     {
         if (!$info = $this->finalInfo) {
             $info = array_merge($this->info, curl_getinfo($this->handle));
-            $info['url'] = $this->info['url'] ?? $info['url'];
             $info['redirect_url'] = $this->info['redirect_url'] ?? null;
 
             // workaround curl not subtracting the time offset for pushed responses
@@ -221,6 +220,7 @@ public function getInfo(?string $type = null): mixed
                 rewind($this->debugBuffer);
                 ftruncate($this->debugBuffer, 0);
             }
+            $this->info = array_merge($this->info, $info);
             $waitFor = curl_getinfo($this->handle, \CURLINFO_PRIVATE);
 
             if ('H' !== $waitFor[0] && 'C' !== $waitFor[0]) {

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@ public function getInfo(?string $type = null): mixed`
`205`	`205`	`{`
`206`	`206`	`if (!$info = $this->finalInfo) {`
`207`	`207`	`$info = array_merge($this->info, curl_getinfo($this->handle));`
`208`		`- $info['url'] = $this->info['url'] ?? $info['url'];`
`209`	`208`	`$info['redirect_url'] = $this->info['redirect_url'] ?? null;`
`210`	`209`
`211`	`210`	`// workaround curl not subtracting the time offset for pushed responses`
`@@ -221,6 +220,7 @@ public function getInfo(?string $type = null): mixed`
`221`	`220`	`rewind($this->debugBuffer);`
`222`	`221`	`ftruncate($this->debugBuffer, 0);`
`223`	`222`	`}`
	`223`	`+ $this->info = array_merge($this->info, $info);`
`224`	`224`	`$waitFor = curl_getinfo($this->handle, \CURLINFO_PRIVATE);`
`225`	`225`
`226`	`226`	`if ('H' !== $waitFor[0] && 'C' !== $waitFor[0]) {`