Skip to content

Commit a0258e4

Browse files
committed
nginx: add patch and bump deps version
1 parent cd2e1fb commit a0258e4

File tree

2 files changed

+32
-5
lines changed

2 files changed

+32
-5
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 4454cc5adeaaf33e66efac7191e275ae49b215a9 Mon Sep 17 00:00:00 2001
2+
From: myfreeer <myfreeer@users.noreply.github.com>
3+
Date: Mon, 4 Mar 2019 19:38:00 +0800
4+
Subject: [PATCH] ngx_win32_init: fix pointer cast in gcc
5+
6+
---
7+
src/os/win32/ngx_win32_init.c | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c
11+
index 70bee8e..3249fb2 100644
12+
--- a/src/os/win32/ngx_win32_init.c
13+
+++ b/src/os/win32/ngx_win32_init.c
14+
@@ -240,7 +240,7 @@ ngx_os_init(ngx_log_t *log)
15+
goto nopoll;
16+
}
17+
18+
- WSAPoll = (ngx_wsapoll_pt) GetProcAddress(hmod, "WSAPoll");
19+
+ WSAPoll = (ngx_wsapoll_pt) (void *) GetProcAddress(hmod, "WSAPoll");
20+
if (WSAPoll == NULL) {
21+
ngx_log_error(NGX_LOG_NOTICE, log, ngx_errno,
22+
"GetProcAddress(\"WSAPoll\") failed");
23+
--
24+
2.19.1
25+

nginx-build-msys2.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,18 @@ fi
3030
# dep versions
3131
ZLIB="$(curl -s 'https://zlib.net/' | grep -ioP 'zlib-(\d+\.)+\d+' | sort -ruV | head -1)"
3232
ZLIB="${ZLIB:-zlib-1.2.11}"
33+
echo $ZLIB
3334
PCRE="$(curl -s 'https://ftp.pcre.org/pub/pcre/' | grep -ioP 'pcre-(\d+\.)+\d+' | sort -ruV | head -1)"
34-
PCRE="${PCRE:-pcre-8.42}"
35+
PCRE="${PCRE:-pcre-8.43}"
36+
echo $PCRE
3537
OPENSSL="$(curl -s 'https://www.openssl.org/source/' | grep -ioP 'openssl-(\d+\.)+[a-z\d]+' | sort -ruV | head -1)"
36-
OPENSSL="${OPENSSL:-openssl-1.1.1a}"
37-
38+
OPENSSL="${OPENSSL:-openssl-1.1.1b}"
39+
echo $OPENSSL
3840
# clone and patch nginx
3941
if [[ -d nginx ]]; then
4042
cd nginx
4143
git checkout master
44+
git branch patch -D
4245
if [[ "${NGINX_TAG}" == "" ]]; then
4346
git reset --hard origin || git reset --hard
4447
git pull
@@ -84,7 +87,6 @@ configure_args=(
8487
--http-fastcgi-temp-path=temp/fastcgi \
8588
--http-scgi-temp-path=temp/scgi \
8689
--http-uwsgi-temp-path=temp/uwsgi \
87-
--with-select_module \
8890
--with-http_v2_module \
8991
--with-http_realip_module \
9092
--with-http_addition_module \
@@ -117,7 +119,7 @@ auto/configure ${configure_args[@]} --with-cc-opt='-s -O2 -fno-strict-aliasing -
117119
# build
118120
make -j$(nproc)
119121
strip -s objs/nginx.exe
120-
version="$(cat src/core/nginx.h | grep NGINX_VERSION | grep -ioP '((\d+\.)+\d)')"
122+
version="$(cat src/core/nginx.h | grep NGINX_VERSION | grep -ioP '((\d+\.)+\d+)')"
121123
mv -f "objs/nginx.exe" "../nginx-${version}-${machine_str}.exe"
122124

123125
# re-configure with debugging log

0 commit comments

Comments
 (0)