Merge branch 'release/v0.2.11'

decodelabs · Nov 28, 2023 · 6afa002 · 6afa002
2 parents 2784be3 + 3e3e0ab
commit 6afa002
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v0.2.11 (2023-11-28)
+* Improved ob_flush handling in transport
+
 ## v0.2.10 (2023-11-26)
 * Added parameter support to deferred stages
 

diff --git a/src/Message/Generator.php b/src/Message/Generator.php
@@ -54,6 +54,7 @@ public function __construct(
         iterable|Closure $iterator,
         bool $buffer = true
     ) {
+        /** @phpstan-ignore-next-line */
         $this->iterator = (function () use ($iterator) {
             if ($iterator instanceof Closure) {
                 $this->fiber = new Fiber($iterator);

diff --git a/src/Transport/Generic.php b/src/Transport/Generic.php
@@ -159,8 +159,11 @@ protected function sendBody(
             $stream->rewind();
         }
 
+        while (ob_get_level() > 0) {
+            ob_end_clean();
+        }
+
         flush();
-        ob_flush();
         set_time_limit(0);
 
         $isChunked = $this->manualChunk ?
@@ -174,19 +177,16 @@ protected function sendBody(
                 echo dechex(strlen($chunk)) . "\r\n";
                 echo $chunk . "\r\n";
                 flush();
-                ob_flush();
             } else {
                 echo $chunk;
                 flush();
-                ob_flush();
             }
         }
 
         // Send end chunk
         if ($isChunked) {
             echo "0\r\n\r\n";
             flush();
-            ob_flush();
         }
     }
 }