From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sun, 8 Jul 2018 00:22:39 +0000 (-0400)
Subject: apache: only generate suphp directives when it will be used
X-Git-Tag: release_20180707-1
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/81180509ead024b0b46beb4a356bf8d7887b5d51?ds=sidebyside

apache: only generate suphp directives when it will be used

suPHP directives should not be added when using fast_php, breaks when
using apache 2.4 with no suphp extension present.
---

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 6174110..c97b9a3 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -533,10 +533,14 @@ fun vhostBody (env, makeFullHost) =
 					   TextIO.output (file, user);
 					   TextIO.output (file, " ");
 					   TextIO.output (file, group);
-					   TextIO.output (file, "\n\tsuPHP_UserGroup ");
-					   TextIO.output (file, user);
-					   TextIO.output (file, " ");
-					   TextIO.output (file, group))
+					   (* suPHP is no longer used for fastcgi php and php 7.x *)
+					   (if php < 6 then
+					       (TextIO.output (file, "\n\tsuPHP_UserGroup ");
+						TextIO.output (file, user);
+						TextIO.output (file, " ");
+						TextIO.output (file, group))
+					    else
+						()))
 				  else
 				      ();