From 4ed5052f317cc911e254ede4947573b671123d51 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 16 Jan 2013 18:28:55 +0100
Subject: php 5.4.11

---
 php.conf   | 5 ++++-
 php54.spec | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/php.conf b/php.conf
index 201efb7..64eb5fd 100644
--- a/php.conf
+++ b/php.conf
@@ -4,7 +4,10 @@
 <FilesMatch \.php$>
     SetHandler application/x-httpd-php
 </FilesMatch>
-# Need for Multiviews
+
+#
+# Allow php to handle Multiviews
+#
 AddType text/html .php
 
 #
diff --git a/php54.spec b/php54.spec
index 8e542f9..eafad67 100644
--- a/php54.spec
+++ b/php54.spec
@@ -65,7 +65,7 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.4.10
+Version: 5.4.11
 %if 0%{?snapdate:1}%{?rcver:1}
 Release: 0.5.%{?snapdate}%{?rcver}%{?dist}
 %else
@@ -1610,6 +1610,10 @@ fi
 
 
 %changelog
+* Wed Jan 16 2013 Remi Collet <rcollet@redhat.com> 5.4.11-1
+- update to 5.4.11
+- fix php.conf to allow MultiViews managed by php scripts
+
 * Wed Dec 19 2012 Remi Collet <rcollet@redhat.com> 5.4.10-1
 - update to 5.4.10
 - remove patches merged upstream
-- 
cgit