[BUGFIX] Sort asset inclusion middleware to execute before content-le…

…ngth Close: #1893
FluidTYPO3 · Jan 15, 2024 · a2444d5 · a2444d5
1 parent 18866ba
commit a2444d5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
diff --git a/Classes/Middleware/AssetInclusion.php b/Classes/Middleware/AssetInclusion.php
@@ -10,7 +10,6 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use TYPO3\CMS\Core\Http\Stream;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 class AssetInclusion implements MiddlewareInterface
 {
@@ -37,18 +36,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $stream = fopen('php://temp', 'rw+');
         fputs($stream, $contents);
 
-        $response = $response->withBody(new Stream($stream));
-
-        // Copied from \TYPO3\CMS\Frontend\Middleware\ContentLengthResponseHeader to ensure proper content-length.
-        if ($GLOBALS['TSFE'] instanceof TypoScriptFrontendController) {
-            if ((!isset($GLOBALS['TSFE']->config['config']['enableContentLengthHeader'])
-                    || $GLOBALS['TSFE']->config['config']['enableContentLengthHeader'])
-                && !$GLOBALS['TSFE']->isBackendUserLoggedIn() && !($GLOBALS['TYPO3_CONF_VARS']['FE']['debug'] ?? false)
-                && !($GLOBALS['TSFE']->config['config']['debug'] ?? false) && !$GLOBALS['TSFE']->doWorkspacePreview()
-            ) {
-                $response = $response->withHeader('Content-Length', (string)$response->getBody()->getSize());
-            }
-        }
-        return $response;
+        return $response->withBody(new Stream($stream));
     }
 }
diff --git a/Configuration/RequestMiddlewares.php b/Configuration/RequestMiddlewares.php
@@ -4,13 +4,7 @@
         'fluidtypo3/vhs/asset-inclusion' => [
             'target' => \FluidTYPO3\Vhs\Middleware\AssetInclusion::class,
             'after' => [
-                'typo3/cms-frontend/shortcut-and-mountpoint-redirect',
-                'typo3/cms-frontend/prepare-tsfe-rendering',
-                'fluidtypo3/vhs/request-availability',
-            ],
-            'before' => [
                 'typo3/cms-frontend/content-length-headers',
-                'typo3/cms-frontend/output-compression',
             ],
         ],
         'fluidtypo3/vhs/request-availability' => [