Skip to content

Commit ee0a371

Browse files
Merge pull request #2992 from craigcomstock/ENT-12696
Added case if http/2(php-fpm binary present) no need for php_version variable for httpd.conf template
2 parents 9955dd0 + 00f6fed commit ee0a371

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

cfe_internal/enterprise/CFE_hub_specific.cf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,12 @@ bundle common cfe_internal_hub_vars
8282

8383
# Determine the version of PHP that is used
8484
# TODO Drop this after 3.18 is no longer supported. It's used for Mission Portals httpd configuration.
85+
# ENT-11440 enabled http/2 which switched from libphp.so apache module to php-fpm.
86+
# httpd.conf doesn't use php_version when http/2 is enabled.
8587

8688
"php_version" -> { "ENT-7039" }
8789
string => ifelse(
90+
fileexists( "$(sys.workdir)/httpd/php/sbin/php-fpm" ), "", # ENT-11440, http/2 in httpd.conf doesn't need php_version
8891
fileexists( "$(sys.workdir)/httpd/modules/libphp.so" ), "", # ENT-7039 php 8+
8992
fileexists( "$(sys.workdir)/httpd/modules/libphp7.so" ), "7",
9093
fileexists( "$(sys.workdir)/httpd/modules/libphp5.so" ), "5",

0 commit comments

Comments
 (0)