Fixed: FS#1330 - Bug in ssl part of vhost config when suphp is used.

Author: tbrehm

server/conf/vhost.conf.master

@@ -305,6 +305,10 @@
     # suexec enabled
     SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
 </tmpl_if>
+# Clear PHP settings of this website
+    <FilesMatch "\.ph(p3?|tml)$">
+        SetHandler None
+    </FilesMatch>
 <tmpl_if name='php' op='==' value='mod'>
     # mod_php enabled
     AddType application/x-httpd-php .php .php3 .php4 .php5
@@ -317,13 +321,18 @@
 </tmpl_if>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='suphp'>
-    suPHP_Engine on
-    # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+    # suphp enabled
+    <Directory {tmpl_var name='web_document_root'}>
+		<IfModule mod_suphp.c>
+        suPHP_Engine on
+        # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
 <tmpl_if name='has_custom_php_ini'>
 	suPHP_ConfigPath <tmpl_var name='custom_php_ini_dir'>
 </tmpl_if>
-    AddHandler x-httpd-suphp .php .php3 .php4 .php5
-    suPHP_AddHandler x-httpd-suphp
+        AddHandler x-httpd-suphp .php .php3 .php4 .php5
+        suPHP_AddHandler x-httpd-suphp
+		</IfModule>
+    </Directory>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='cgi'>
     # php as cgi enabled