mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
10 Commits
v1.15.8.1r
...
v1.15.8.1
Author | SHA1 | Date | |
---|---|---|---|
2b40d7b8ee | |||
bf2e5697e1 | |||
540567e42c | |||
a32ca0dbbe | |||
62d31e53de | |||
023b9d4f88 | |||
8954793847 | |||
0b5ebedd47 | |||
7e897a8b2b | |||
99d72856a7 |
15
patches/nginx-1.15.8-win32_max_err_str.patch
Normal file
15
patches/nginx-1.15.8-win32_max_err_str.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/src/os/win32/ngx_event_log.c b/src/os/win32/ngx_event_log.c
|
||||||
|
index e11ed1e8..dce8eddd 100644
|
||||||
|
--- a/src/os/win32/ngx_event_log.c
|
||||||
|
+++ b/src/os/win32/ngx_event_log.c
|
||||||
|
@@ -8,7 +8,9 @@
|
||||||
|
#include <ngx_core.h>
|
||||||
|
|
||||||
|
|
||||||
|
-#define NGX_MAX_ERROR_STR 2048
|
||||||
|
+#ifndef NGX_MAX_ERROR_STR
|
||||||
|
+#define NGX_MAX_ERROR_STR 4096
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
|
||||||
|
void ngx_cdecl
|
810
t/sanity.t
810
t/sanity.t
File diff suppressed because it is too large
Load Diff
@ -34,6 +34,10 @@ cd nginx-$ver || exit 1
|
|||||||
|
|
||||||
# patch the patch
|
# patch the patch
|
||||||
|
|
||||||
|
echo "$info_txt applying the nginx-$main_ver-win32_max_err_str.patch"
|
||||||
|
patch -p1 < $root/patches/nginx-$main_ver-win32_max_err_str.patch || exit 1
|
||||||
|
echo
|
||||||
|
|
||||||
answer=`$root/util/ver-ge "$main_ver" 1.13.3`
|
answer=`$root/util/ver-ge "$main_ver" 1.13.3`
|
||||||
if [ "$answer" = "N" ]; then
|
if [ "$answer" = "N" ]; then
|
||||||
echo "$info_txt applying the patch for nginx security advisory (CVE-2017-7529)"
|
echo "$info_txt applying the patch for nginx security advisory (CVE-2017-7529)"
|
||||||
@ -496,7 +500,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.10.14
|
ver=0.10.15
|
||||||
$root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
|
mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
|
||||||
@ -510,7 +514,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.0.6
|
ver=0.0.7
|
||||||
$root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
|
mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
|
||||||
@ -609,7 +613,7 @@ mv openresty-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.23
|
ver=0.24
|
||||||
$root/util/get-tarball "https://github.com/openresty/resty-cli/tarball/v$ver" -O resty-cli-$ver.tar.gz || exit 1
|
$root/util/get-tarball "https://github.com/openresty/resty-cli/tarball/v$ver" -O resty-cli-$ver.tar.gz || exit 1
|
||||||
tar -xzf resty-cli-$ver.tar.gz || exit 1
|
tar -xzf resty-cli-$ver.tar.gz || exit 1
|
||||||
mv openresty-resty-cli-* resty-cli-$ver || exit 1
|
mv openresty-resty-cli-* resty-cli-$ver || exit 1
|
||||||
@ -650,7 +654,7 @@ mv openresty-opm-* opm-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=2.1-20190228
|
ver=2.1-20190507
|
||||||
$root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
|
||||||
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
||||||
mv luajit2-* LuaJIT-$ver || exit 1
|
mv luajit2-* LuaJIT-$ver || exit 1
|
||||||
@ -826,7 +830,7 @@ cd ..
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.1.16
|
ver=0.1.17
|
||||||
$root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
|
||||||
tar -xzf lua-resty-core-$ver.tar.gz || exit 1
|
tar -xzf lua-resty-core-$ver.tar.gz || exit 1
|
||||||
mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1
|
mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1
|
||||||
|
Reference in New Issue
Block a user