diff vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)
author Chris Cannam
date Fri, 23 Feb 2018 15:52:07 +0000
parents 4c8ae668cc8c
children c2387f117808
line wrap: on
line diff
--- a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php	Fri Feb 23 15:51:18 2018 +0000
+++ b/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php	Fri Feb 23 15:52:07 2018 +0000
@@ -1,9 +1,7 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -23,19 +21,13 @@
      * body content via the output buffer.
      *
      * @param ResponseInterface $response
-     * @param null|int $maxBufferLevel Maximum output buffering level to unwrap.
      */
-    public function emit(ResponseInterface $response, $maxBufferLevel = null)
+    public function emit(ResponseInterface $response)
     {
-        if (headers_sent()) {
-            throw new RuntimeException('Unable to emit response; headers already sent');
-        }
+        $this->assertNoPreviousOutput();
 
-        $response = $this->injectContentLength($response);
-
+        $this->emitHeaders($response);
         $this->emitStatusLine($response);
-        $this->emitHeaders($response);
-        $this->flush($maxBufferLevel);
         $this->emitBody($response);
     }