From 57058f5ab03435004938457dd6416596af55a951 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 11:18:10 +0800 Subject: [PATCH 01/13] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 828d31e9d..b747f00e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ setuptools>=33.1.1 Werkzeug>=1.0.1,<3.0.0 wheel>=0.37.1 -gunicorn==20.1.0 +gunicorn==22.0.0 requests>=2.27.1 urllib3>=1.21.1 flask>=2.0.3,<3.0.0 From 8ea87a47ea730b9557a6c5a4bf8ae4c9040cc889 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 11:25:05 +0800 Subject: [PATCH 02/13] Update r3.6.txt --- version/r3.6.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/version/r3.6.txt b/version/r3.6.txt index 73def1be8..4828d044a 100644 --- a/version/r3.6.txt +++ b/version/r3.6.txt @@ -2,4 +2,5 @@ cryptography==36.0.1 flask==2.0.3 pyOpenSSL==22.0.0 requests==2.27.1 -gevent==22.10.2 \ No newline at end of file +gevent==22.10.2 +gunicorn==20.1.0 \ No newline at end of file From 28c233522361981923d0dc865513f142bc363df5 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 11:25:18 +0800 Subject: [PATCH 03/13] Update r3.7.txt --- version/r3.7.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/version/r3.7.txt b/version/r3.7.txt index 49020ffd7..53a4eec12 100644 --- a/version/r3.7.txt +++ b/version/r3.7.txt @@ -1,2 +1,3 @@ urllib3==1.21.1 -gevent==22.10.2 \ No newline at end of file +gevent==22.10.2 +gunicorn==20.1.0 \ No newline at end of file From 95a84c7ac5cf4289d3ab6e926f2d1068f412cda3 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 11:27:22 +0800 Subject: [PATCH 04/13] Update r3.7.txt --- version/r3.7.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/r3.7.txt b/version/r3.7.txt index 53a4eec12..b11b01dba 100644 --- a/version/r3.7.txt +++ b/version/r3.7.txt @@ -1,3 +1,3 @@ urllib3==1.21.1 gevent==22.10.2 -gunicorn==20.1.0 \ No newline at end of file +gunicorn==21.2.0 \ No newline at end of file From 5aca1ef7088cbb851f3e8be469b593ff598acce1 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 11:29:03 +0800 Subject: [PATCH 05/13] Update r3.6.txt --- version/r3.6.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/r3.6.txt b/version/r3.6.txt index 4828d044a..84c406e11 100644 --- a/version/r3.6.txt +++ b/version/r3.6.txt @@ -3,4 +3,4 @@ flask==2.0.3 pyOpenSSL==22.0.0 requests==2.27.1 gevent==22.10.2 -gunicorn==20.1.0 \ No newline at end of file +gunicorn==21.2.0 \ No newline at end of file From ff29679b4224178d4282f58f92a26593982b8b0a Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 12:34:07 +0800 Subject: [PATCH 06/13] update --- plugins/php/install.sh | 2 +- plugins/php/versions/common/fileinfo.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/php/install.sh b/plugins/php/install.sh index 692b6acb5..16f66fbe8 100755 --- a/plugins/php/install.sh +++ b/plugins/php/install.sh @@ -63,7 +63,7 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then # cd /www/server/mdserver-web/plugins/php/versions/common && bash intl.sh install 73 # cd /www/server/mdserver-web/plugins/php/versions/common && bash gd.sh install 56 # cd /www/server/mdserver-web/plugins/php/versions/common && bash openssl.sh install 56 - # cd /www/server/mdserver-web/plugins/php/versions/common && bash sodium.sh install 81 + # cd /www/server/mdserver-web/plugins/php/versions/common && bash fileinfo.sh install 81 cd ${rootPath}/plugins/php/versions/common && bash gd.sh install ${type} cd ${rootPath}/plugins/php/versions/common && bash iconv.sh install ${type} cd ${rootPath}/plugins/php/versions/common && bash exif.sh install ${type} diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 4e7871c90..e0a481d17 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -37,6 +37,8 @@ else BAK='' fi +OSNAME=`cat ${rootPath}/data/osname.pl` + Install_lib() { @@ -59,6 +61,7 @@ Install_lib() OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu" fi + $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS @@ -66,7 +69,6 @@ Install_lib() # It is considered as a temporary bug if [ "$version" == "81" ] || [ "$version" == "82" ];then bash ${rootPath}/scripts/getos.sh - OSNAME=`cat ${rootPath}/data/osname.pl` if [ "$OSNAME" == 'centos' ];then FILE_softmagic=$sourcePath/php${version}/ext/${LIBNAME}/libmagic/softmagic.c FIND_UNDEF_STRNDUP=`cat $FILE_softmagic|grep '#undef strndup'` @@ -81,6 +83,11 @@ Install_lib() sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=gnu99/g' Makefile fi + if [ "$version" -gt "80" ] && [ "$OSNAME" == 'centos' ];then + sed -i $BAK "s#CFLAGS = -g -O2#CFLAGS = -std=c99 -g#g" $sourcePath/php${version}/ext/${LIBNAME}/Makefile + fi + + make clean && make && make install && make clean if [ -d $sourcePath/php${version} ];then From b64e3b772f32a2552ae1601dd271cd80431b90ef Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 13:07:21 +0800 Subject: [PATCH 07/13] Update all_test.sh --- plugins/php/versions/all_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/all_test.sh b/plugins/php/versions/all_test.sh index 9584fcfeb..2dd50670a 100644 --- a/plugins/php/versions/all_test.sh +++ b/plugins/php/versions/all_test.sh @@ -39,7 +39,7 @@ for PHP_VER in ${PHP_VER_LIST[@]}; do done cd $DIR -PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82) +PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83) # yar PHP_EXT_LIST=(ZendGuardLoader pdo mysqlnd sqlite3 openssl opcache mcrypt fileinfo \ exif gd intl pcntl memcache memcached redis imagemagick xdebug \ From 3f36019c2ecef274dd58096f8ef9e470d49484c5 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 16:44:51 +0800 Subject: [PATCH 08/13] Create altsvc.cache --- class/core/site_api.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/class/core/site_api.py b/class/core/site_api.py index de6013295..029953933 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -2811,11 +2811,11 @@ location ^~ {from} {\n\ tmp = re.findall(rep, conf) if not mw.inArray(tmp, '443'): listen = re.search(rep, conf).group() - http_ssl = "\n\tlisten 443 ssl http2;" - http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;" - + http_ssl = "\n\tlisten 443 ssl reuseport;" + http_ssl = http_ssl + "\n\tlisten [::]:443 ssl reuseport;" if version == '1.25.3.1': - http_ssl = http_ssl + "\n\tlisten 443 quic;" + http_ssl = http_ssl + "\n\tlisten 443 quic reuseport;" + http_ssl = http_ssl + "\n\thttp2 on;" conf = conf.replace(listen, listen + http_ssl) From 0504ca3887edad1df55f7f7540c0f0aa63416326 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 16:58:08 +0800 Subject: [PATCH 09/13] Update site_api.py --- class/core/site_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/class/core/site_api.py b/class/core/site_api.py index 029953933..eeb80f676 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -2784,10 +2784,10 @@ location ^~ {from} {\n\ if conf: if conf.find('ssl_certificate') == -1: #ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE; - + # add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400'; http3Header = """ add_header Strict-Transport-Security "max-age=63072000"; - add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400'; + add_header Alt-Svc 'h3=":443";ma=86400'; """ if version != '1.25.3.1': http3Header = ''; From d926a69b59c52d555f7486bde7d0e41df273d76b Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 17:35:48 +0800 Subject: [PATCH 10/13] Update site_api.py --- class/core/site_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/class/core/site_api.py b/class/core/site_api.py index eeb80f676..ea482e679 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -2815,6 +2815,7 @@ location ^~ {from} {\n\ http_ssl = http_ssl + "\n\tlisten [::]:443 ssl reuseport;" if version == '1.25.3.1': http_ssl = http_ssl + "\n\tlisten 443 quic reuseport;" + http_ssl = http_ssl + "\n\tlisten [::]:443 quic reuseport;" http_ssl = http_ssl + "\n\thttp2 on;" conf = conf.replace(listen, listen + http_ssl) From b6e1f46379de5366c10b0a1875dca64a8b2ea40b Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 17:38:08 +0800 Subject: [PATCH 11/13] Update site_api.py --- class/core/site_api.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/class/core/site_api.py b/class/core/site_api.py index ea482e679..b9b9dbb9a 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -763,6 +763,8 @@ class site_api: conf = re.sub(rep, '', conf) rep = "\s+listen\s+\[\:\:\]\:443.*;" conf = re.sub(rep, '', conf) + rep = "\s+http2\s+on;" + conf = re.sub(rep, '', conf) mw.writeFile(file, conf) msg = mw.getInfo('网站[{1}]关闭SSL成功!', (siteName,)) From d6a816b06e766e7f1bd4ebca4bac53786fa50e92 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 17:40:00 +0800 Subject: [PATCH 12/13] Update site_api.py --- class/core/site_api.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/class/core/site_api.py b/class/core/site_api.py index b9b9dbb9a..76d2a9c85 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -2813,12 +2813,17 @@ location ^~ {from} {\n\ tmp = re.findall(rep, conf) if not mw.inArray(tmp, '443'): listen = re.search(rep, conf).group() - http_ssl = "\n\tlisten 443 ssl reuseport;" - http_ssl = http_ssl + "\n\tlisten [::]:443 ssl reuseport;" + if version == '1.25.3.1': + http_ssl = "\n\tlisten 443 ssl reuseport;" + http_ssl = http_ssl + "\n\tlisten [::]:443 ssl reuseport;" http_ssl = http_ssl + "\n\tlisten 443 quic reuseport;" http_ssl = http_ssl + "\n\tlisten [::]:443 quic reuseport;" http_ssl = http_ssl + "\n\thttp2 on;" + else: + http_ssl = "\n\tlisten 443 ssl http2;" + http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;" + conf = conf.replace(listen, listen + http_ssl) From 1439d4edf695eb5ec3cca029b0fa31c3f328211c Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 17 Apr 2024 17:52:22 +0800 Subject: [PATCH 13/13] Update site_api.py --- class/core/site_api.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/class/core/site_api.py b/class/core/site_api.py index 76d2a9c85..d79fcdb39 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -2815,10 +2815,10 @@ location ^~ {from} {\n\ listen = re.search(rep, conf).group() if version == '1.25.3.1': - http_ssl = "\n\tlisten 443 ssl reuseport;" - http_ssl = http_ssl + "\n\tlisten [::]:443 ssl reuseport;" - http_ssl = http_ssl + "\n\tlisten 443 quic reuseport;" - http_ssl = http_ssl + "\n\tlisten [::]:443 quic reuseport;" + http_ssl = "\n\tlisten 443 ssl;" + http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;#reuseport" + http_ssl = http_ssl + "\n\tlisten 443 quic;" + http_ssl = http_ssl + "\n\tlisten [::]:443 quic;" http_ssl = http_ssl + "\n\thttp2 on;" else: http_ssl = "\n\tlisten 443 ssl http2;"