summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-01-08 02:52:03 -0800
committerVincent Petry <pvince81@owncloud.com>2014-01-08 02:52:03 -0800
commit5f11bdfe08158c1bdcf1832544b330b760d48c26 (patch)
tree4a9d86e833120ba7c4a35cd7fcd66c07750401da
parenta8d20e0919be4eff67c618452c92b12120258b0e (diff)
parent4c93b00990edb786e96421d4e3d791a831ad091b (diff)
downloadnextcloud-server-5f11bdfe08158c1bdcf1832544b330b760d48c26.tar.gz
nextcloud-server-5f11bdfe08158c1bdcf1832544b330b760d48c26.zip
Merge pull request #6675 from owncloud/disable-mod_pagespeed
turn off mod_pagespeed
-rwxr-xr-x.htaccess3
-rw-r--r--lib/private/setup.php3
2 files changed, 6 insertions, 0 deletions
diff --git a/.htaccess b/.htaccess
index 08e2a82facb..fa6263c7ffe 100755
--- a/.htaccess
+++ b/.htaccess
@@ -38,3 +38,6 @@ DirectoryIndex index.php index.html
</IfModule>
AddDefaultCharset utf-8
Options -Indexes
+<IfModule pagespeed_module>
+ ModPagespeed Off
+</IfModule>
diff --git a/lib/private/setup.php b/lib/private/setup.php
index b5c530a091f..5232398d1d7 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -159,6 +159,9 @@ class OC_Setup {
$content.= "</IfModule>\n";
$content.= "AddDefaultCharset utf-8\n";
$content.= "Options -Indexes\n";
+ $content.= "<IfModule pagespeed_module>\n";
+ $content.= "ModPagespeed Off\n";
+ $content.= "</IfModule>\n";
@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
self::protectDataDirectory();