Fix missing white space in apache directive

[manu/suphp.git] / debian / conf / suphp.conf

diff --git a/debian/conf/suphp.conf b/debian/conf/suphp.conf
index 42d8fd5..0d2830e 100644 (file)
--- a/debian/conf/suphp.conf
+++ b/debian/conf/suphp.conf
@@ -1,9 +1,21 @@
 <IfModule mod_suphp.c>
-       AddHandler x-httpd-php .php .php3 .php4 .php5 .phtml
-       suPHP_AddHandler x-httpd-php
-       suPHP_Engine on
+    <FilesMatch "\.ph(p3?|tml)$">
+        SetHandler application/x-httpd-suphp
+    </FilesMatch>
+       suPHP_AddHandler application/x-httpd-suphp
+
+    <Directory />
+        suPHP_Engine on
+    </Directory>
+
+    # By default, disable suPHP for debian packaged web applications as files
+    # are owned by root and cannot be executed by suPHP because of min_uid.
+    <Directory /usr/share>
+        suPHP_Engine off
+    </Directory>
+
 # # Use a specific php config file (a dir which contains a php.ini file)
-#      suPHP_ConfigPath /etc/php4/cgi/suphp/
+#      suPHP_ConfigPath /etc/php5/cgi/suphp/
 # # Tells mod_suphp NOT to handle requests with the type <mime-type>.
 #      suPHP_RemoveHandler <mime-type>
 </IfModule>