diff options
| author |  Dezponia <150628177+dezponia@users.noreply.github.com>
| 2025-03-13 22:40:26 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-03-13 22:40:26 +0100 |
| commit | df545b513b1c43e54da5b023bf3fe01bf36ad013 (patch) | |
| tree | 7bccbde1e9c15081cdad481f347e79fe38df2bb7 | |
| parent | e61f00cb64f6bc23c427b2bc5160050e07178e79 (diff) | |
Add check for Apache mod_filter to ensure "AddOutputFilterByType" works. (#7419)
* Update .htaccess
Add check for Apache mod_filter to ensure "AddOutputFilterByType" works.
* Explicit enabling mod_filter in our Docker images
---------
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
| -rw-r--r-- | .devcontainer/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Newest | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Oldest | 2 | ||||
| -rw-r--r-- | p/.htaccess | 6 |
6 files changed, 9 insertions, 7 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0aa6334c8..b87093ad9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,7 +15,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ /etc/apache2/httpd.conf && \ - sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ + sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|filter|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf diff --git a/Docker/Dockerfile b/Docker/Dockerfile index c90a5c0a2..b66d9c7ec 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -37,7 +37,7 @@ LABEL \ RUN a2dismod -q -f alias autoindex negotiation status && \ a2dismod -q auth_openidc && \ phpdismod calendar exif ffi ftp gettext mysqli posix readline shmop sockets sysvmsg sysvsem sysvshm xsl && \ - a2enmod -q deflate expires headers mime remoteip setenvif && \ + a2enmod -q deflate expires filter headers mime remoteip setenvif && \ a2disconf -q '*' && \ a2dissite -q '*' && \ a2ensite -q 'FreshRSS*' diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 9396d4b87..fd2849044 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -35,7 +35,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ /etc/apache2/httpd.conf && \ - sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ + sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|filter|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest index aa2091b00..80cc03094 100644 --- a/Docker/Dockerfile-Newest +++ b/Docker/Dockerfile-Newest @@ -36,7 +36,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ /etc/apache2/httpd.conf && \ - sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ + sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|filter|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ diff --git a/Docker/Dockerfile-Oldest b/Docker/Dockerfile-Oldest index d1e11a2eb..38fbadede 100644 --- a/Docker/Dockerfile-Oldest +++ b/Docker/Dockerfile-Oldest @@ -35,7 +35,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ /etc/apache2/httpd.conf && \ - sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ + sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|filter|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ diff --git a/p/.htaccess b/p/.htaccess index d8c3e8486..e7376e46e 100644 --- a/p/.htaccess +++ b/p/.htaccess @@ -18,8 +18,10 @@ AddDefaultCharset UTF-8 AddCharset UTF-8 .js </IfModule> -<IfModule mod_deflate.c> - AddOutputFilterByType DEFLATE application/javascript application/json application/xhtml+xml image/svg+xml text/css text/html +<IfModule mod_filter.c> + <IfModule mod_deflate.c> + AddOutputFilterByType DEFLATE application/javascript application/json application/xhtml+xml image/svg+xml text/css text/html + </IfModule> </IfModule> <IfModule mod_expires.c> |