diff --git a/core/assets/scaffold/files/htaccess b/core/assets/scaffold/files/htaccess index 7e38f73369..eaeeb9de35 100644 --- a/core/assets/scaffold/files/htaccess +++ b/core/assets/scaffold/files/htaccess @@ -145,32 +145,6 @@ AddEncoding gzip svgz # Specifically, disallow autoload.php from being served directly. RewriteRule "^(.+/.*|autoload)\.php($|/)" - [F] - # Rules to correctly serve gzip compressed CSS and JS files. - # Requires both mod_rewrite and mod_headers to be enabled. - - # Serve gzip compressed CSS files if they exist and the client accepts gzip. - RewriteCond %{HTTP:Accept-encoding} gzip - RewriteCond %{REQUEST_FILENAME}\.gz -s - RewriteRule ^(.*)\.css $1\.css\.gz [QSA] - - # Serve gzip compressed JS files if they exist and the client accepts gzip. - RewriteCond %{HTTP:Accept-encoding} gzip - RewriteCond %{REQUEST_FILENAME}\.gz -s - RewriteRule ^(.*)\.js $1\.js\.gz [QSA] - - # Serve correct content types, and prevent double compression. - RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1] - RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1,E=no-brotli:1] - - - # Serve correct encoding type. - Header set Content-Encoding gzip - # Force proxies to cache gzipped & non-gzipped css/js files separately. - Header append Vary Accept-Encoding - - - - # Various header fixes. # Disable content sniffing, since it's an attack vector. diff --git a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php index 80a591fdd1..ddc481a5c8 100644 --- a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php +++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php @@ -73,8 +73,6 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase { ], 'css' => [ 'preprocess' => TRUE, - // gzip is not handled by the migration. - 'gzip' => TRUE, ], // fast_404 is not handled by the migration. 'fast_404' => [ @@ -85,8 +83,6 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase { ], 'js' => [ 'preprocess' => FALSE, - // gzip is not handled by the migration. - 'gzip' => TRUE, ], // stale_file_threshold is not handled by the migration. 'stale_file_threshold' => 2592000,