From 25a2cb8c6e821df0360d1843c5266cbf7acc2b55 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Thu, 16 Feb 2017 11:45:11 +0100
Subject: [PATCH] Only request "IndexIgnore" if mod_autoindex is loaded
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
---
apps/user_ldap/tests/.htaccess | 2 ++
build/.htaccess | 2 ++
config/.htaccess | 2 ++
lib/private/Setup.php | 2 ++
4 files changed, 8 insertions(+)
diff --git a/apps/user_ldap/tests/.htaccess b/apps/user_ldap/tests/.htaccess
index 5e068d28661..6fde30e763a 100755
--- a/apps/user_ldap/tests/.htaccess
+++ b/apps/user_ldap/tests/.htaccess
@@ -11,4 +11,6 @@ Satisfy All
</ifModule>
# section for Apache 2.2 and 2.4
+<ifModule mod_autoindex.c>
IndexIgnore *
+</ifModule>
diff --git a/build/.htaccess b/build/.htaccess
index c7a7b79feac..853aed187d3 100644
--- a/build/.htaccess
+++ b/build/.htaccess
@@ -9,4 +9,6 @@ deny from all
</ifModule>
# section for Apache 2.2 and 2.4
+<ifModule mod_autoindex.c>
IndexIgnore *
+</ifModule>
diff --git a/config/.htaccess b/config/.htaccess
index c7a7b79feac..853aed187d3 100644
--- a/config/.htaccess
+++ b/config/.htaccess
@@ -9,4 +9,6 @@ deny from all
</ifModule>
# section for Apache 2.2 and 2.4
+<ifModule mod_autoindex.c>
IndexIgnore *
+</ifModule>
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 321e8ea4c66..b20614f8971 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -492,7 +492,9 @@ class Setup {
$content.= "Satisfy All\n";
$content.= "</ifModule>\n\n";
$content.= "# section for Apache 2.2 and 2.4\n";
+ $content.= "<ifModule mod_autoindex.c>\n";
$content.= "IndexIgnore *\n";
+ $content.= "</ifModule>\n";
$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
file_put_contents($baseDir . '/.htaccess', $content);
--
GitLab