apache: only generate suphp directives when it will be used

[hcoop/domtool2.git] / src / plugins / apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 6174110..c97b9a3 100644 (file)
--- 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, 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
                                      ();
 
                                  else
                                      ();