Fix chunked transfer encoding problems due to trailing whitespace.

fago · fago · commit a41f3a303379 · 2020-07-24T08:24:02.000+02:00
diff --git a/lib/Doctrine/CouchDB/HTTP/SocketClient.php b/lib/Doctrine/CouchDB/HTTP/SocketClient.php
@@ -288,14 +288,13 @@ public function request($method, $path, $data = null, $raw = false, array $heade
                     // are just footnotes, which are not relevant for us.
                     $bytesLeft = $bytesToRead;
                     while ($bytesLeft > 0) {
-                        $body .= $read = fread($this->connection, $bytesLeft + 2);
+                        $read = fread($this->connection, $bytesLeft + 2);
+                        // Chop off \r\n from the end.
+                        $body .= rtrim($read);
                         $bytesLeft -= strlen($read);
                     }
                 }
             } while ($bytesToRead > 0);
-
-            // Chop off \r\n from the end.
-            $body = substr($body, 0, -2);
         }
 
         // Reset the connection if the server asks for it.

Original file line number	Diff line number	Diff line change
`@@ -288,14 +288,13 @@ public function request($method, $path, $data = null, $raw = false, array $heade`
`288`	`288`	`// are just footnotes, which are not relevant for us.`
`289`	`289`	`$bytesLeft = $bytesToRead;`
`290`	`290`	`while ($bytesLeft > 0) {`
`291`		`- $body .= $read = fread($this->connection, $bytesLeft + 2);`
	`291`	`+ $read = fread($this->connection, $bytesLeft + 2);`
	`292`	`+ // Chop off \r\n from the end.`
	`293`	`+ $body .= rtrim($read);`
`292`	`294`	`$bytesLeft -= strlen($read);`
`293`	`295`	`}`
`294`	`296`	`}`
`295`	`297`	`} while ($bytesToRead > 0);`
`296`		`-`
`297`		`- // Chop off \r\n from the end.`
`298`		`- $body = substr($body, 0, -2);`
`299`	`298`	`}`
`300`	`299`
`301`	`300`	`// Reset the connection if the server asks for it.`