From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sat, 1 Feb 2020 19:45:07 +0000 (-0500)
Subject: apache: enable php 7.4 support
X-Git-Tag: release_20200201
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/58807e6807a77e3b9fd5494a0e6f76ab0a70eabd

apache: enable php 7.4 support
---

diff --git a/lib/apache.dtl b/lib/apache.dtl
index c4a8ac7..9269ee1 100644
--- a/lib/apache.dtl
+++ b/lib/apache.dtl
@@ -41,6 +41,8 @@ extern val php72 : php_version;
 {{FastCGI based php 7.2.}}
 extern val php73 : php_version;
 {{FastCGI based php 7.3.}}
+extern val php74 : php_version;
+{{FastCGI based php 7.4.}}
 
 val fast_php : php_version = php56;
 
diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 236aa9d..c87644c 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -474,6 +474,7 @@ fun vhostPost () = (!post ();
 val php_version = fn (EVar "php56", _) => SOME 56
                    | (EVar "php72", _) => SOME 72
 		   | (EVar "php73", _) => SOME 73
+		   | (EVar "php74", _) => SOME 74
 		   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =