From 8de805ee73477b597433753891e243992d68ba91d21d2740df8e5999909c1d8a Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Sat, 5 Nov 2016 03:02:34 +0000
Subject: [PATCH] Accepting request 438758 from home:computersalat:devel:php

fix phpMyAdmin.http

OBS-URL: https://build.opensuse.org/request/show/438758
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=266
---
 phpMyAdmin.changes |  5 ++++
 phpMyAdmin.http    | 64 ++++++++++++++++++++++++++++------------------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 4f65ab9..35015c2 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov  5 02:54:41 UTC 2016 - chris@computersalat.de
+
+- fix phpMyAdmin.http
+
 -------------------------------------------------------------------
 Thu Aug 18 13:31:57 UTC 2016 - chris@computersalat.de
 
diff --git a/phpMyAdmin.http b/phpMyAdmin.http
index 2b237af..057c56c 100644
--- a/phpMyAdmin.http
+++ b/phpMyAdmin.http
@@ -1,30 +1,44 @@
 <Directory @ap_docroot@/@name@>
-  Options FollowSymLinks
-  AllowOverride None
-  <IfModule mod_php5.c>
-    php_admin_flag register_globals off
-    php_admin_flag magic_quotes_gpc off
-    php_admin_flag allow_url_include off
-    php_admin_flag allow_url_fopen off
-    php_admin_flag zend.ze1_compatibility_mode off
-    php_admin_flag safe_mode Off
-    php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat"
-    # customize suhosin
-    php_admin_value suhosin.post.max_array_index_length 256
-    php_admin_value suhosin.post.max_totalname_length 8192
-    php_admin_value suhosin.post.max_vars 2048
-    php_admin_value suhosin.request.max_array_index_length 256
-    php_admin_value suhosin.request.max_totalname_length 8192
-    php_admin_value suhosin.request.max_vars 2048
-  </IfModule>
+    Options FollowSymLinks
+    AllowOverride None
+
+    <IfModule mod_php5.c>
+        php_admin_flag register_globals off
+        php_admin_flag magic_quotes_gpc off
+        php_admin_flag allow_url_include off
+        php_admin_flag allow_url_fopen off
+        php_admin_flag zend.ze1_compatibility_mode off
+        php_admin_flag safe_mode Off
+        php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat"
+        # customize suhosin
+        php_admin_value suhosin.post.max_array_index_length 256
+        php_admin_value suhosin.post.max_totalname_length 8192
+        php_admin_value suhosin.post.max_vars 2048
+        php_admin_value suhosin.request.max_array_index_length 256
+        php_admin_value suhosin.request.max_totalname_length 8192
+        php_admin_value suhosin.request.max_vars 2048
+    </IfModule>
+
 </Directory>
 <Directory @ap_docroot@/@name@/libraries>
-  <IfVersion >= 2.4>
-    Require all denied
-  </IfVersion>
-  <IfVersion < 2.4>
-    Order allow,deny
-    Deny from all
-  </IfVersion>
+
+    <IfVersion < 2.4>
+        Order allow,deny
+        Deny from all
+    </IfVersion>
+
+    <IfVersion >= 2.4>
+
+        <IfModule !mod_access_compat.c>
+            Require all denied
+        </IfModule>
+
+        <IfModule mod_access_compat.c>
+            Order deny,allow
+            Deny from all
+        </IfModule>
+
+    </IfVersion>
+
 </Directory>