[php/f18] - update to 5.4.11 - fix php.conf to allow MultiViews managed by php scripts

[Remi Collet]

commit 5a7d6dd3f49897dce997c909811ff926e0485722
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 16 17:32:12 2013 +0100

    - update to 5.4.11
    - fix php.conf to allow MultiViews managed by php scripts

 .gitignore |    2 ++
 php.conf   |    5 +++++
 php.spec   |    6 +++++-
 sources    |    2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a352e1..ad67dc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ php-5.3*.bz2
 /php-5.4.9RC1.tar.bz2
 /php-5.4.9.tar.bz2
 /php-5.4.10.tar.bz2
+/php-5.4.11RC1.tar.bz2
+/php-5.4.11.tar.bz2
diff --git a/php.conf b/php.conf
index 075ccaa..64eb5fd 100644
--- a/php.conf
+++ b/php.conf
@@ -6,6 +6,11 @@
 </FilesMatch>
 
 #
+# Allow php to handle Multiviews
+#
+AddType text/html .php
+
+#
 # Add index.php to the list of files that will be served as directory
 # indexes.
 #
diff --git a/php.spec b/php.spec
index 478f1fe..e620e42 100644
--- a/php.spec
+++ b/php.spec
@@ -57,7 +57,7 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.4.10
+Version: 5.4.11
 Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -1403,6 +1403,10 @@ fi
 
 
 %changelog
+* Wed Jan 16 2013 Remi Collet <rcollet at 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 at redhat.com> 5.4.10-1
 - update to 5.4.10
 - remove patches merged upstream
diff --git a/sources b/sources
index fc9d191..c09a98e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb716b657a30570b9b468b9e7bc551a1  php-5.4.10.tar.bz2
+9975e68c22b86b013b934743ad2d2276  php-5.4.11.tar.bz2