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

feature: bundled and enabled ngx_stream_lua_module by default. this module is still experimental.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2017-10-26 10:41:47 -07:00
parent f46beb607b
commit 3763c5380e
3 changed files with 216 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
util/configure vendored
View File

@ -89,6 +89,7 @@ my @modules = (
#[http_auth_request => 'auth-request-nginx-module'],
[http_rds_json => 'rds-json-nginx-module'],
[http_rds_csv => 'rds-csv-nginx-module'],
[stream_lua => 'ngx_stream_lua'],
);
my $without_resty_mods_regex;
@ -96,7 +97,7 @@ my $without_resty_mods_regex;
my $s = '^--without-('
. join('|',
map { $_->[0] }
grep { @$_ == 2 && $_->[0] =~ /^http_/ }
grep { @$_ == 2 && $_->[0] =~ /^(?:http|stream)_/ }
@modules
)
. ')_module$';
@ -111,7 +112,7 @@ my $with_resty_mods_regex;
my $s = '^--with-('
. join('|',
map { $_->[0] }
grep { @$_ == 3 && $_->[0] =~ /^http_/ }
grep { @$_ == 3 && $_->[0] =~ /^(?:http|stream)_/ }
@modules
)
. ')_module$';
@ -472,14 +473,21 @@ _END_
}
}
if (!$opts->{no_stream_lua}) {
push @ngx_opts, '--with-stream', '--with-stream_ssl_module';
}
if (!$opts->{lua}
&& !$opts->{lua_path}
&& !$opts->{no_http_lua}
&& (!$opts->{no_http_lua} || !$opts->{no_stream_lua})
&& !$opts->{luajit_path})
{
#warn "HIT!";
$opts->{luajit} = 1;
}
#die "luajit: ", $opts->{luajit};
if ($opts->{luajit} && $opts->{luajit_path}) {
die "--with-luajit and --with-luajit=DIR are mutually exclusive.\n";
}
@ -1117,7 +1125,7 @@ _EOC_
for my $mod (@modules) {
my $name = $mod->[0];
if ($name =~ /^http_/) {
if ($name =~ /^(?:http|stream)_/) {
if (@$mod == 2) {
my $opt = " --without-${name}_module";
$msg .= $opt;