php 5.4: improves php.conf, improves filter, apply ldap_r patch on fedora >= 18 only

1 files changed, 7 insertions, 4 deletions

diff --git a/php.conf b/php.conf
index 82b206b..075ccaa 100644
--- a/php.conf
+++ b/php.conf
@@ -1,8 +1,9 @@
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script .php
-AddType text/html .php
+<FilesMatch \.php$>
+    SetHandler application/x-httpd-php
+</FilesMatch>
 
 #
 # Add index.php to the list of files that will be served as directory
@@ -11,10 +12,12 @@ AddType text/html .php
 DirectoryIndex index.php
 
 #
-# Uncomment the following line to allow PHP to pretty-print .phps
+# Uncomment the following lines to allow PHP to pretty-print .phps
 # files as PHP source code:
 #
-#AddType application/x-httpd-php-source .phps
+#<FilesMatch \.phps$>
+#    SetHandler application/x-httpd-php-source
+#</FilesMatch>
 
 #
 # Apache specific PHP configuration options