From f701555745c11ace11f5171d2b71440d4ba548d5 Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Wed, 16 May 2018 16:15:42 +0200
Subject: [PATCH] Merge branch
 '5837-update-the-contrib-apache-fusiondirectory-apache-conf' into '1.3-dev'

Resolve "Update the contrib/apache/fusiondirectory-apache.conf"

Closes #5837

See merge request fusiondirectory/fd!274

(cherry picked from commit d051d8238f1528a5acc1d13b5d7e3aa5160ad174)

c4698558 :ambulance: fix(apache) Update the contrib/apache/fusiondirectory-apache.conf
---
 contrib/apache/fusiondirectory-apache.conf | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/contrib/apache/fusiondirectory-apache.conf b/contrib/apache/fusiondirectory-apache.conf
index 5a2ebb203..34ab65318 100644
--- a/contrib/apache/fusiondirectory-apache.conf
+++ b/contrib/apache/fusiondirectory-apache.conf
@@ -2,17 +2,13 @@
 Alias /fusiondirectory /var/www/fusiondirectory/html
 
 <IfModule mod_php5.c>
-<Location /fusiondirectory>
+<Directory /fusiondirectory>
     php_admin_flag engine on
-    php_admin_flag register_globals off
-    php_admin_flag allow_call_time_pass_reference off
     php_admin_flag expose_php off
-    php_admin_flag zend.ze1_compatibility_mode off
-    php_admin_flag register_long_arrays off
     php_admin_value upload_tmp_dir /var/spool/fusiondirectory/
     php_admin_value session.cookie_lifetime 0
 # Remove the comment from the line below if you use fusiondirectory-setup --encrypt-passwords
 #   include /etc/fusiondirectory/fusiondirectory.secrets
-</Location>
+</Directory>
 </IfModule>
 
-- 
GitLab