diff --git a/src/scripts/extensions/http.ps1 b/src/scripts/extensions/http.ps1 index fb5260ba..2303eb8e 100644 --- a/src/scripts/extensions/http.ps1 +++ b/src/scripts/extensions/http.ps1 @@ -40,6 +40,7 @@ Function Repair-ICU() { } Function Add-Http() { + Add-Extension iconv >$null 2>&1 Add-Extension raphf >$null 2>&1 if($version -lt '8.0') { Add-Extension propro >$null 2>&1 diff --git a/src/scripts/extensions/http.sh b/src/scripts/extensions/http.sh index abd2a06f..7d25831c 100644 --- a/src/scripts/extensions/http.sh +++ b/src/scripts/extensions/http.sh @@ -11,10 +11,11 @@ get_http_version() { # Function to enable http extension. enable_http() { + enable_extension iconv extension enable_extension propro extension enable_extension raphf extension - if (! [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension propro && check_extension raphf) || - ( [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension raphf); then + if (! [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension iconv && check_extension propro && check_extension raphf) || + ( [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension iconv && check_extension raphf); then enable_extension http extension fi } @@ -25,10 +26,12 @@ add_http_dependencies() { add_pecl_extension raphf 1.1.2 extension add_pecl_extension propro 1.0.2 extension elif [[ ${version:?} =~ 5.6|7.[0-4] ]]; then - add_extension_helper propro - add_extension_helper raphf + add_extension iconv extension + add_extension propro extension + add_extension raphf extension else - add_extension_helper raphf + add_extension iconv extension + add_extension raphf extension fi }