[bugzilla-gnome-org-upstream: 32/32] Merge branch '4.4' into master (test instance)



commit 096240b85f5d2d2d2d6a877436a22a3fc1a2ac74
Merge: 794f1b1 12ee110
Author: Andrea Veri <av gnome org>
Date:   Wed May 18 13:56:36 2016 +0200

    Merge branch '4.4' into master (test instance)

 .htaccess                                         |    7 +--
 Bugzilla/Constants.pm                             |    2 +-
 Bugzilla/Install/Filesystem.pm                    |   45 ++--------
 Bugzilla/Install/Requirements.pm                  |   12 ++-
 Bugzilla/Mailer.pm                                |   18 +---
 Bugzilla/Template.pm                              |   12 ++-
 Bugzilla/User.pm                                  |    9 ++-
 Bugzilla/Util.pm                                  |   12 ++-
 Bugzilla/WebService/Bugzilla.pm                   |    2 +-
 Bugzilla/WebService/Product.pm                    |    1 +
 Bugzilla/WebService/Server/XMLRPC.pm              |    9 ++
 Bugzilla/WebService/User.pm                       |    2 -
 attachment.cgi                                    |    1 +
 docs/bugzilla.ent.tmpl                            |    6 +-
 docs/en/xml/installation.xml                      |    2 +-
 importxml.pl                                      |    3 +
 mod_perl.pl                                       |    2 +-
 showdependencygraph.cgi                           |   19 +++-
 taskgraph.json                                    |   96 +++++++++++++--------
 template/en/default/global/tabs.html.tmpl         |    2 +-
 template/en/default/pages/release-notes.html.tmpl |   64 ++++++++++++++
 21 files changed, 206 insertions(+), 120 deletions(-)
---
diff --cc .htaccess
index 8f40e96,22e6658..973b396
--- a/.htaccess
+++ b/.htaccess
@@@ -1,16 -1,11 +1,11 @@@
  # Don't allow people to retrieve non-cgi executable files or our private data
 -<FilesMatch (\.pm|\.pl|\.tmpl|localconfig.*)$>
 +<FilesMatch (\.pm|\.pl|\.tmpl|localconfig.*|cpanfile)$>
    <IfModule mod_version.c>
      <IfVersion < 2.4>
 -     Deny from all
 +      Deny from all
      </IfVersion>
      <IfVersion >= 2.4>
-       <IfModule mod_perl.c>
-         Deny from all
-       </IfModule>
-       <IfModule !mod_perl.c>
-         Require all denied
-       </IfModule>
+       Require all denied
      </IfVersion>
    </IfModule>
    <IfModule !mod_version.c>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]