actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2024-11-26 13:23:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix enabling http

Browse Source
This commit is contained in:
Shivam Mathur 2022-03-15 11:28:20 +05:30
parent e29242d481
commit 927419e77f
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scripts/extensions/http.ps1
View File

@ -40,6 +40,7 @@ Function Repair-ICU() {
} }
Function Add-Http() { Function Add-Http() {
Add-Extension iconv >$null 2>&1
Add-Extension raphf >$null 2>&1 Add-Extension raphf >$null 2>&1
if($version -lt '8.0') { if($version -lt '8.0') {
Add-Extension propro >$null 2>&1 Add-Extension propro >$null 2>&1

13
src/scripts/extensions/http.sh
View File

@ -11,10 +11,11 @@ get_http_version() {
# Function to enable http extension. # Function to enable http extension.
enable_http() { enable_http() {
enable_extension iconv extension
enable_extension propro extension enable_extension propro extension
enable_extension raphf extension enable_extension raphf extension
if (! [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension propro && check_extension raphf) || if (! [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension iconv && check_extension propro && check_extension raphf) ||
( [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension raphf); then ( [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension iconv && check_extension raphf); then
enable_extension http extension enable_extension http extension
fi fi
} }
@ -25,10 +26,12 @@ add_http_dependencies() {
add_pecl_extension raphf 1.1.2 extension add_pecl_extension raphf 1.1.2 extension
add_pecl_extension propro 1.0.2 extension add_pecl_extension propro 1.0.2 extension
elif [[ ${version:?} =~ 5.6|7.[0-4] ]]; then elif [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
add_extension_helper propro add_extension iconv extension
add_extension_helper raphf add_extension propro extension
add_extension raphf extension
else else
add_extension_helper raphf add_extension iconv extension
add_extension raphf extension
fi fi
} }