186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

upgraded ngx_stream_lua to 0.0.8rc3 and ngx_http_lua to 0.10.16rc5.

Browse Source 
bugfix: now we avoid introducing double quotes or single quotes in CFLAGS variable values. Fix #587.

win32/win64: upgraded openssl to 1.1.1e.
This commit is contained in:
Yichun Zhang (agentzh)
2020-03-19 15:20:55 -07:00
parent 2ac0ad9f03
commit 8cf88e3b13
4 changed files with 168 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/build-win32.sh
View File

@ -2,10 +2,10 @@
PCRE=pcre-8.44
ZLIB=zlib-1.2.11
OPENSSL=openssl-1.1.1d
OPENSSL=openssl-1.1.1e
JOBS=12
# wget https://www.openssl.org/source/openssl-1.1.1d.tar.gz
# wget https://www.openssl.org/source/openssl-1.1.1e.tar.gz
# wget http://zlib.net/zlib-1.2.11.tar.gz
# wget https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.gz

56
util/configure vendored
View File

@ -965,21 +965,57 @@ int main(void) {
$lualib_prefix = File::Spec->catfile($prefix, "lualib");
my $site_lualib_prefix = File::Spec->catfile($prefix, "site/lualib");
my $ngx_lua_dir = auto_complete 'ngx_lua';
open my $in, ">>$ngx_lua_dir/config" or
die "Cannot open $ngx_lua_dir/config for appending: $!\n";
{
print $in <<"_EOC_";
my $ngx_lua_dir = auto_complete 'ngx_lua';
ngx_lua_dquote='"'
CFLAGS="\$CFLAGS -DLUA_DEFAULT_PATH='\${ngx_lua_dquote}$site_lualib_prefix/?.ljbc;$site_lualib_prefix/?/init.ljbc;$lualib_prefix/?.ljbc;$lualib_prefix/?/init.ljbc;$site_lualib_prefix/?.lua;$site_lualib_prefix/?/init.lua;$lualib_prefix/?.lua;$lualib_prefix/?/init.lua\$ngx_lua_dquote'"
CFLAGS="\$CFLAGS -DLUA_DEFAULT_CPATH='\${ngx_lua_dquote}$site_lualib_prefix/?.so;$lualib_prefix/?.so\$ngx_lua_dquote'"
my $outfile = "$ngx_lua_dir/config";
open my $in, ">>$outfile" or
die "Cannot open $outfile for appending: $!\n";
{
print $in <<"_EOC_";
echo '
#ifndef LUA_DEFAULT_PATH
#define LUA_DEFAULT_PATH "$site_lualib_prefix/?.ljbc;$site_lualib_prefix/?/init.ljbc;$lualib_prefix/?.ljbc;$lualib_prefix/?/init.ljbc;$site_lualib_prefix/?.lua;$site_lualib_prefix/?/init.lua;$lualib_prefix/?.lua;$lualib_prefix/?/init.lua"
#endif
#ifndef LUA_DEFAULT_CPATH
#define LUA_DEFAULT_CPATH "$site_lualib_prefix/?.so;$lualib_prefix/?.so"
#endif
' >> "\$ngx_addon_dir/src/ngx_http_lua_autoconf.h"
_EOC_
}
close $in;
}
close $in;
{
my $ngx_stream_lua_dir = auto_complete 'ngx_stream_lua';
my $outfile = "$ngx_stream_lua_dir/config";
open my $in, ">>$outfile" or
die "Cannot open $outfile for appending: $!\n";
{
print $in <<"_EOC_";
echo '
#ifndef LUA_DEFAULT_PATH
#define LUA_DEFAULT_PATH "$site_lualib_prefix/?.ljbc;$site_lualib_prefix/?/init.ljbc;$lualib_prefix/?.ljbc;$lualib_prefix/?/init.ljbc;$site_lualib_prefix/?.lua;$site_lualib_prefix/?/init.lua;$lualib_prefix/?.lua;$lualib_prefix/?/init.lua"
#endif
#ifndef LUA_DEFAULT_CPATH
#define LUA_DEFAULT_CPATH "$site_lualib_prefix/?.so;$lualib_prefix/?.so"
#endif
' >> "\$ngx_addon_dir/src/ngx_stream_lua_autoconf.h"
_EOC_
}
close $in;
}
unless ($opts->{no_lua_cjson}) {
my $dir = auto_complete 'lua-cjson';

4
util/mirror-tarballs
View File

@ -548,7 +548,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.10.16rc4
ver=0.10.16rc5
$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
mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
@ -562,7 +562,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1
#################################
ver=0.0.8rc2
ver=0.0.8rc3
$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
mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1