Skip to content

Using a filename mask in the include directive of geo blocks #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jimf5 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Using a filename mask in the include directive of geo blocks #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9becf21
Tests: removed unsafe check for geo binary tests.
jimf5 Mar 12, 2026
6532db5
Tests: using filename mask in get.t and stream_geo.t.
jimf5 Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions geo.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ http {

EOF

$t->write_file('nginx.conf', $t->read_file('nginx.conf') =~ s/ geo\./ *geo./gr)
if $t->has_version('1.29.8');
$t->write_file('1', '');
$t->write_file('2', '');
$t->write_file('geo.conf', '127.0.0.0/8 loopback;');
Expand Down
2 changes: 0 additions & 2 deletions geo_binary.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ use Test::Nginx;
select STDERR; $| = 1;
select STDOUT; $| = 1;

plan(skip_all => 'long configuration parsing') unless $ENV{TEST_NGINX_UNSAFE};

my $t = Test::Nginx->new()->has(qw/http geo/);

$t->write_file_expand('nginx.conf', <<'EOF');
Expand Down
2 changes: 2 additions & 0 deletions stream_geo.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ stream {

EOF

$t->write_file('nginx.conf', $t->read_file('nginx.conf') =~ s/ geo\./ *geo./gr)
if $t->has_version('1.29.8');
$t->write_file('geo.conf', '127.0.0.0/8 loopback;');
$t->write_file('geo-ranges.conf', '127.0.0.0-127.255.255.255 loopback;');

Expand Down
2 changes: 0 additions & 2 deletions stream_geo_binary.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ use Test::Nginx::Stream qw/ stream /;
select STDERR; $| = 1;
select STDOUT; $| = 1;

plan(skip_all => 'long configuration parsing') unless $ENV{TEST_NGINX_UNSAFE};

my $t = Test::Nginx->new()->has(qw/stream stream_return stream_geo/);

$t->write_file_expand('nginx.conf', <<'EOF');
Expand Down