Skip to content

Commit 9c8e626

Browse files
committed
Merge branch 'experiment-feature' into build_native_php
2 parents 6eb9bcd + 1297f15 commit 9c8e626

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

sapi/quickstart/windows/msys2-build/install-msys2.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,17 @@ fi
5151
pacman -S --needed --noconfirm git curl wget openssl
5252
pacman -S --needed --noconfirm zip unzip xz gcc gcc-libs cmake make
5353
pacman -S --needed --noconfirm re2c
54-
pacman -S --needed --noconfirm openssl-devel libreadline
5554
pacman -S --needed --noconfirm lzip
5655
pacman -S --needed --noconfirm zip unzip
5756
pacman -S --needed --noconfirm zlib-devel
5857
pacman -S --needed --noconfirm bison automake autoconf libtool coreutils
58+
pacman -S --needed --noconfirm openssl-devel libreadline-devel libiconv-devel
5959
pacman -S --needed --noconfirm libcurl-devel libxml2-devel libxslt-devel
6060
pacman -S --needed --noconfirm libbz2-devel liblz4-devel liblzma-devel libcares-devel
61-
pacman -S --needed --noconfirm libyaml-devel libzstd-devel libreadline-devel
62-
pacman -S --needed --noconfirm libssh2-devel libidn2-devel gettext-devel
6361
pacman -S --needed --noconfirm libzstd-devel
64-
pacman -S --needed --noconfirm icu-devel
65-
pacman -S --needed --noconfirm libsqlite-devel libsqlite
62+
pacman -S --needed --noconfirm libyaml-devel
63+
pacman -S --needed --noconfirm libssh2-devel libidn2-devel gettext-devel
64+
pacman -S --needed --noconfirm libsqlite-devel
6665
pacman -S --needed --noconfirm libedit-devel
6766
pacman -S --needed --noconfirm gmp-devel
6867
pacman -S --needed --noconfirm brotli-devel

setup-php-runtime.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ done
9797

9898
case "$MIRROR" in
9999
china)
100-
APP_DOWNLOAD_URL="https://wenda-1252906962.file.myqcloud.com/dist/${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}.tar.xz"
100+
APP_DOWNLOAD_URL="https://storage.swoole.com/dist/${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}.tar.xz"
101101
COMPOSER_DOWNLOAD_URL="https://mirrors.tencent.com/composer/composer.phar"
102102
if [ $OS = 'windows' ]; then
103-
APP_DOWNLOAD_URL="https://wenda-1252906962.file.myqcloud.com/dist/${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}.zip"
103+
APP_DOWNLOAD_URL="https://storage.swoole.com/dist/${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}.zip"
104104
fi
105105
;;
106106

setup-swoole-cli-runtime.ps1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ try
3636

3737
if ($mirror -eq 'china')
3838
{
39-
$APP_DOWNLOAD_URL = "https://wenda-1252906962.file.myqcloud.com/dist/$APP_NAME-$APP_VERSION-cygwin-x64.zip"
39+
$APP_DOWNLOAD_URL = "https://storage.swoole.com/dist/$APP_NAME-$APP_VERSION-cygwin-x64.zip"
4040
}
4141
if ($proxy -ne '')
4242
{
@@ -47,13 +47,17 @@ try
4747
{
4848
if (Get-Command "curl.exe" -ErrorAction SilentlyContinue)
4949
{
50-
curl.exe -fSLo "$TMP_APP_RUNTIME\$FILE" $APP_DOWNLOAD_URL
50+
curl.exe -H 'Referer: https://www.swoole.com/download' -H 'User-Agent: download swoole-cli runtime with setup-swoole-cli-runtime.ps1' -fSLo "$TMP_APP_RUNTIME\$FILE" $APP_DOWNLOAD_URL
5151
}
5252
else
5353
{
54+
$headers = @{
55+
'User-Agent' = 'download swoole-cli runtime with setup-swoole-cli-runtime.ps1'
56+
'Referer' = 'https://www.swoole.com/download'
57+
}
5458
# Invoke-WebRequest $APP_DOWNLOAD_URL -UseBasicParsing -OutFile $FILE
5559
# Invoke-WebRequest -Uri $APP_DOWNLOAD_URL -OutFile $FILE
56-
irm $APP_DOWNLOAD_URL -outfile "$TMP_APP_RUNTIME\$FILE"
60+
irm $APP_DOWNLOAD_URL -Headers $headers -outfile "$TMP_APP_RUNTIME\$FILE"
5761
}
5862
}
5963

setup-swoole-cli-runtime.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ fi
121121

122122
case "$MIRROR" in
123123
china)
124-
APP_DOWNLOAD_URL="https://wenda-1252906962.file.myqcloud.com/dist/${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}.tar.xz"
124+
APP_DOWNLOAD_URL="https://storage.swoole.com/dist/${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}.tar.xz"
125125
COMPOSER_DOWNLOAD_URL="https://mirrors.tencent.com/composer/composer.phar"
126126
if [ $OS = 'windows' ]; then
127-
APP_DOWNLOAD_URL="https://wenda-1252906962.file.myqcloud.com/dist/${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}.zip"
127+
APP_DOWNLOAD_URL="https://storage.swoole.com/dist/${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}.zip"
128128
fi
129129
;;
130130

0 commit comments

Comments
 (0)