From 46e8032081a1f1715db3a6b8724cef5472ddea3e Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Fri, 3 Mar 2023 18:40:16 +0100 Subject: [PATCH] Fix swoole compile options (#712) --- install-php-extensions | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/install-php-extensions b/install-php-extensions index 33f980d..9664d54 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -3306,7 +3306,7 @@ installRemoteModule() { fi ;; esac - if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 5.0.0) -ge 0; then + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 5.0.1) -ge 0; then # enable sockets supports? addConfigureOption enable-sockets $installRemoteModule_sockets # enable openssl support? @@ -3317,6 +3317,34 @@ installRemoteModule() { addConfigureOption enable-swoole-curl yes # enable cares support? addConfigureOption enable-cares yes + # enable brotli support? + addConfigureOption enable-brotli yes + elif test $(compareVersions "$installRemoteModule_version" 5.0.0) -ge 0; then + # enable sockets supports? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable mysqlnd support? + addConfigureOption enable-mysqlnd yes + # enable curl support? + addConfigureOption enable-swoole-curl yes + # enable cares support? + addConfigureOption enable-cares yes + elif test $(compareVersions "$installRemoteModule_version" 4.8.11) -ge 0; then + # enable sockets supports? + addConfigureOption enable-sockets $installRemoteModule_sockets + # enable openssl support? + addConfigureOption enable-openssl $installRemoteModule_openssl + # enable http2 support? + addConfigureOption enable-http2 yes + # enable mysqlnd support? + addConfigureOption enable-mysqlnd yes + # enable json support? + addConfigureOption enable-swoole-json yes + # enable curl support? + addConfigureOption enable-swoole-curl yes + # enable cares support? + addConfigureOption enable-cares yes elif test $(compareVersions "$installRemoteModule_version" 4.6.1) -ge 0; then # enable sockets supports? addConfigureOption enable-sockets $installRemoteModule_sockets @@ -3329,16 +3357,7 @@ installRemoteModule() { # enable json support? addConfigureOption enable-swoole-json yes # enable curl support? - if test $PHP_MAJMINPAT_VERSION -ne 80000 || test $(compareVersions "$installRemoteModule_version" 4.6.1) -ge 0; then - addConfigureOption enable-swoole-curl yes - else - # https://github.com/swoole/swoole-src/issues/3977#issuecomment-754755521 - addConfigureOption enable-swoole-curl no - fi - if test $(compareVersions "$installRemoteModule_version" 4.8.11) -ge 0; then - # enable cares support? - addConfigureOption enable-cares yes - fi + addConfigureOption enable-swoole-curl yes elif test $(compareVersions "$installRemoteModule_version" 4.4.0) -ge 0; then # enable sockets supports? addConfigureOption enable-sockets $installRemoteModule_sockets