Take upstream changes

[sysconfig/apache2.git] / mods-available / php5.conf

diff --git a/mods-available/php5.conf b/mods-available/php5.conf
index 04fc35744225f25550003c6dc47275c6fbb1ce13..5d2f9112f49a47bf0b01824263132c5508acf49a 100644 (file)
--- a/mods-available/php5.conf
+++ b/mods-available/php5.conf
@@ -1,4 +1,16 @@
 <IfModule mod_php5.c>
-  AddType application/x-httpd-php .php .phtml .php3
-  AddType application/x-httpd-php-source .phps
+    <FilesMatch "\.ph(p3?|tml)$">
+       SetHandler application/x-httpd-php
+    </FilesMatch>
+    <FilesMatch "\.phps$">
+       SetHandler application/x-httpd-php-source
+    </FilesMatch>
+    # To re-enable php in user directories comment the following lines
+    # (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
+    # prevents .htaccess files from disabling it.
+    <IfModule mod_userdir.c>
+        <Directory /home/*/public_html>
+            php_admin_value engine Off
+        </Directory>
+    </IfModule>
 </IfModule>