From d705db0d178c25b99a34fc751edcb2db3aeb7e21 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 28 Aug 2012 22:15:44 +0000
Subject: [PATCH] Bug 785511: Prevent directory browsing, especially in docs/
 and extensions/ r=dkl a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@264164 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                     |  2 +-
 mozilla/webtools/bugzilla/.htaccess                   |  3 +++
 .../webtools/bugzilla/docs/en/xml/installation.xml    | 11 ++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index aa32b0690aa..0d5f8eebb88 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8359
\ No newline at end of file
+8360
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.htaccess b/mozilla/webtools/bugzilla/.htaccess
index 4b06fe9a9c1..27f478afdaf 100644
--- a/mozilla/webtools/bugzilla/.htaccess
+++ b/mozilla/webtools/bugzilla/.htaccess
@@ -2,6 +2,9 @@
 <FilesMatch ^(.*\.pm|.*\.pl|.*localconfig.*)$>
   deny from all
 </FilesMatch>
+
+Options -Indexes
+
 <IfModule mod_expires.c>
 <IfModule mod_headers.c>
 <IfModule mod_env.c>
diff --git a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
index 8c5c29b8e8f..18de454b9f4 100644
--- a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
+++ b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
@@ -1056,19 +1056,20 @@ SetEnv LD_LIBRARY_PATH /u01/app/oracle/product/10.2.0/lib/
                 <programlisting>
 &lt;Directory /var/www/html/bugzilla&gt;
 AddHandler cgi-script .cgi
-Options +Indexes +ExecCGI
-DirectoryIndex index.cgi
-AllowOverride Limit FileInfo Indexes
+Options +ExecCGI
+DirectoryIndex index.cgi index.html
+AllowOverride Limit FileInfo Indexes Options
 &lt;/Directory&gt;
                 </programlisting>
     
                 <para>
                 These instructions: allow apache to run .cgi files found
                 within the bugzilla directory; instructs the server to look
-                for a file called <filename>index.cgi</filename> if someone
+                for a file called <filename>index.cgi</filename> or, if not
+                found, <filename>index.html</filename> if someone
                 only types the directory name into the browser; and allows
                 Bugzilla's <filename>.htaccess</filename> files to override
-                global permissions.
+                some global permissions.
                 </para>
     
                 <note>