From 3c75c631c3423f89606426974b1a52e8dcaf0912c384cf5bfd2420be63b23761 Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Fri, 2 Dec 2016 13:13:56 +0000
Subject: [PATCH] Accepting request 443181 from home:computersalat:devel:php

update phpPgAdmin.http, add support for apache 2.4, php7

OBS-URL: https://build.opensuse.org/request/show/443181
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpPgAdmin?expand=0&rev=20
---
 phpPgAdmin.changes |  7 ++++++
 phpPgAdmin.http    | 57 +++++++++++++++++++++++++++++++---------------
 phpPgAdmin.spec    |  2 +-
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/phpPgAdmin.changes b/phpPgAdmin.changes
index c989a0e..50eb9cc 100644
--- a/phpPgAdmin.changes
+++ b/phpPgAdmin.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec  2 11:24:39 UTC 2016 - chris@computersalat.de
+
+- udpate phpPgAdmin.http
+  * add support for Apache 2.2/2.4
+  * add suppport for php7
+
 -------------------------------------------------------------------
 Wed Jan  6 18:26:46 UTC 2016 - chris@computersalat.de
 
diff --git a/phpPgAdmin.http b/phpPgAdmin.http
index b60a5a5..aa51c5c 100644
--- a/phpPgAdmin.http
+++ b/phpPgAdmin.http
@@ -1,23 +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@"
-  </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@"
+    </IfModule>
+
+    <IfModule mod_php7.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/php7:/tmp:@docdir@/@name@:/etc/@name@"
+    </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>
 
diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index 3f0228c..bbccec6 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package phpPgAdmin
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed