Giuseppe Lavagetto has submitted this change and it was merged. Change subject: HAT: remove addencoding directives that are harmful on apache 2.4 ......................................................................
HAT: remove addencoding directives that are harmful on apache 2.4 As shown by bug #73274, any wiki page ending in .Z would result in an incorrect Content-encoding header, so we plainly remove those directives. The only place where I can see this being maybe problematic is on commons maybe? but plain non-image files are served by swift anyway, so this should really be ok. Change-Id: Ie9157e541311ba0614c712f50fb6908a37fc5fa5 Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M modules/mediawiki/files/apache/modules/mime.conf 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Ori.livneh: Looks good to me, but someone else must approve Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/mediawiki/files/apache/modules/mime.conf b/modules/mediawiki/files/apache/modules/mime.conf index 7608a07..9f6c1cc 100644 --- a/modules/mediawiki/files/apache/modules/mime.conf +++ b/modules/mediawiki/files/apache/modules/mime.conf @@ -1,7 +1,10 @@ <IfModule mod_mime.c> - AddEncoding x-compress Z - AddEncoding x-gzip gz tgz - + # Do not add AddEncoding directives here in apache 2.4 as would mess with + # the output encoding of pages; see BUG 73274 + <IfVersion < 2.4> + AddEncoding x-compress Z + AddEncoding x-gzip gz tgz + </IfVersion> AddLanguage da .dk AddLanguage nl .nl AddLanguage en .en -- To view, visit https://gerrit.wikimedia.org/r/172578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9157e541311ba0614c712f50fb6908a37fc5fa5 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
