Skip to content

Commit

Permalink
[BUGFIX] Disable file compression for external urls in js and css inc…
Browse files Browse the repository at this point in the history 
…ludes

Resolves: #53123
Releases: master, 8.7
Change-Id: I8030e434a27ae2f2c5934706eec6f64e64e31cd3
Reviewed-on: https://review.typo3.org/58867
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Josef Glatz <josef.glatz@typo3.org>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Willi Wehmeier <wwwehmeier@gmail.com>
Reviewed-by: Jörg Bösche <typo3@joergboesche.de>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
  • Loading branch information
@benjaminkott @janhelke
benjaminkott authored and janhelke committed Dec 7, 2018
1 parent 2c65392 commit 8306763
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions typo3/sysext/frontend/Classes/Http/RequestHandler.php
View file
Expand Up @@ -494,7 +494,7 @@ protected function generatePageContentWithHeader(TypoScriptFrontendController $c
$cssFileConfig['alternate'] ? 'alternate stylesheet' : 'stylesheet',
$cssFileConfig['media'] ?: 'all',
$cssFileConfig['title'] ?: '',
empty($cssFileConfig['disableCompression']),
$cssFileConfig['external'] ? false : empty($cssFileConfig['disableCompression']),
(bool)$cssFileConfig['forceOnTop'],
$cssFileConfig['allWrap'],
(bool)$cssFileConfig['excludeFromConcatenation'] || (bool)$cssFileConfig['inline'],
Expand Down Expand Up @@ -536,7 +536,7 @@ protected function generatePageContentWithHeader(TypoScriptFrontendController $c
$cssFileConfig['alternate'] ? 'alternate stylesheet' : 'stylesheet',
$cssFileConfig['media'] ?: 'all',
$cssFileConfig['title'] ?: '',
empty($cssFileConfig['disableCompression']),
$cssFileConfig['external'] ? false : empty($cssFileConfig['disableCompression']),
(bool)$cssFileConfig['forceOnTop'],
$cssFileConfig['allWrap'],
(bool)$cssFileConfig['excludeFromConcatenation'] || (bool)$cssFileConfig['inline'],
Expand Down Expand Up @@ -609,7 +609,7 @@ protected function generatePageContentWithHeader(TypoScriptFrontendController $c
$key,
$ss,
$type,
empty($jsFileConfig['disableCompression']),
$jsFileConfig['external'] ? false : empty($jsFileConfig['disableCompression']),
(bool)$jsFileConfig['forceOnTop'],
$jsFileConfig['allWrap'],
(bool)$jsFileConfig['excludeFromConcatenation'],
Expand Down Expand Up @@ -653,7 +653,7 @@ protected function generatePageContentWithHeader(TypoScriptFrontendController $c
$key,
$ss,
$type,
empty($jsFileConfig['disableCompression']),
$jsFileConfig['external'] ? false : empty($jsFileConfig['disableCompression']),
(bool)$jsFileConfig['forceOnTop'],
$jsFileConfig['allWrap'],
(bool)$jsFileConfig['excludeFromConcatenation'],
Expand Down Expand Up @@ -697,7 +697,7 @@ protected function generatePageContentWithHeader(TypoScriptFrontendController $c
$pageRenderer->addJsFile(
$ss,
$type,
empty($jsConfig['disableCompression']),
$jsConfig['external'] ? false : empty($jsConfig['disableCompression']),
(bool)$jsConfig['forceOnTop'],
$jsConfig['allWrap'],
(bool)$jsConfig['excludeFromConcatenation'],
Expand Down Expand Up @@ -740,7 +740,7 @@ protected function generatePageContentWithHeader(TypoScriptFrontendController $c
$pageRenderer->addJsFooterFile(
$ss,
$type,
empty($jsConfig['disableCompression']),
$jsConfig['external'] ? false : empty($jsConfig['disableCompression']),
(bool)$jsConfig['forceOnTop'],
$jsConfig['allWrap'],
(bool)$jsConfig['excludeFromConcatenation'],
Expand Down
12 changes: 6 additions & 6 deletions typo3/sysext/frontend/Classes/Page/PageGenerator.php
View file
Expand Up @@ -336,7 +336,7 @@ public static function renderContentWithHeader($pageContent)
$cssFileConfig['alternate'] ? 'alternate stylesheet' : 'stylesheet',
$cssFileConfig['media'] ?: 'all',
$cssFileConfig['title'] ?: '',
empty($cssFileConfig['disableCompression']),
$cssFileConfig['external'] ? false : empty($cssFileConfig['disableCompression']),
(bool)$cssFileConfig['forceOnTop'],
$cssFileConfig['allWrap'],
(bool)$cssFileConfig['excludeFromConcatenation'] || (bool)$cssFileConfig['inline'],
Expand Down Expand Up @@ -378,7 +378,7 @@ public static function renderContentWithHeader($pageContent)
$cssFileConfig['alternate'] ? 'alternate stylesheet' : 'stylesheet',
$cssFileConfig['media'] ?: 'all',
$cssFileConfig['title'] ?: '',
empty($cssFileConfig['disableCompression']),
$cssFileConfig['external'] ? false : empty($cssFileConfig['disableCompression']),
(bool)$cssFileConfig['forceOnTop'],
$cssFileConfig['allWrap'],
(bool)$cssFileConfig['excludeFromConcatenation'] || (bool)$cssFileConfig['inline'],
Expand Down Expand Up @@ -451,7 +451,7 @@ public static function renderContentWithHeader($pageContent)
$key,
$ss,
$type,
empty($jsFileConfig['disableCompression']),
$jsFileConfig['external'] ? false : empty($jsFileConfig['disableCompression']),
(bool)$jsFileConfig['forceOnTop'],
$jsFileConfig['allWrap'],
(bool)$jsFileConfig['excludeFromConcatenation'],
Expand Down Expand Up @@ -495,7 +495,7 @@ public static function renderContentWithHeader($pageContent)
$key,
$ss,
$type,
empty($jsFileConfig['disableCompression']),
$jsFileConfig['external'] ? false : empty($jsFileConfig['disableCompression']),
(bool)$jsFileConfig['forceOnTop'],
$jsFileConfig['allWrap'],
(bool)$jsFileConfig['excludeFromConcatenation'],
Expand Down Expand Up @@ -539,7 +539,7 @@ public static function renderContentWithHeader($pageContent)
$pageRenderer->addJsFile(
$ss,
$type,
empty($jsConfig['disableCompression']),
$jsConfig['external'] ? false : empty($jsConfig['disableCompression']),
(bool)$jsConfig['forceOnTop'],
$jsConfig['allWrap'],
(bool)$jsConfig['excludeFromConcatenation'],
Expand Down Expand Up @@ -582,7 +582,7 @@ public static function renderContentWithHeader($pageContent)
$pageRenderer->addJsFooterFile(
$ss,
$type,
empty($jsConfig['disableCompression']),
$jsConfig['external'] ? false : empty($jsConfig['disableCompression']),
(bool)$jsConfig['forceOnTop'],
$jsConfig['allWrap'],
(bool)$jsConfig['excludeFromConcatenation'],
Expand Down

0 comments on commit 8306763

Please sign in to comment.