Skip to content

Commit

Permalink
Merge pull request chobits#246 from chobits/for_pull_request
Browse files Browse the repository at this point in the history
fixed occasional failure of test cases in CI/CD workflow
  • Loading branch information
chobits authored Nov 12, 2022
2 parents 3930c7e + 627becd commit 99202bf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions t/http_proxy_connect.t
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ http {
resolver 127.0.0.1:18085 ipv6=off; # NOTE: cannot connect ipv6 address ::1 in mac os x.
server {
listen 8081;
listen 8082; # address.com
listen 8083; # bind.conm
listen 127.0.0.1:8081;
listen 127.0.0.1:8082; # address.com
listen 127.0.0.1:8083; # bind.conm
server_name server_8081;
access_log off;
location / {
Expand All @@ -118,11 +118,11 @@ http {
proxy_connect_bind $proxy_local_address;
if ($host = "address.com") {
set $proxy_remote_address "127.0.0.1:8082";
set $proxy_remote_address "127.0.0.01:8082";
}
if ($host = "bind.com") {
set $proxy_remote_address "127.0.0.1:8083";
set $proxy_remote_address "127.0.0.01:8083";
set $proxy_local_address "127.0.0.1"; # NOTE that we cannot bind 127.0.0.3 in mac os x.
}
Expand All @@ -131,7 +131,7 @@ http {
}
location / {
proxy_pass http://127.0.0.1:8081;
proxy_pass http://127.0.0.01:8081;
}
location = /hello {
Expand Down Expand Up @@ -219,7 +219,7 @@ http {
access_log off;
server {
listen 8082;
listen 127.0.0.1:8082;
location / {
return 200 "backend server: $remote_addr $server_port\n";
}
Expand All @@ -234,7 +234,7 @@ http {
proxy_connect;
proxy_connect_allow all;
proxy_connect_address 127.0.0.1:8082;
proxy_connect_address 127.0.0.01:8082;
if ($host = "if-return-skip.com") {
return 200 "if-return\n";
Expand Down
2 changes: 1 addition & 1 deletion t/http_proxy_connect_resolve_variables.t
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ http {
}
location / {
proxy_pass http://127.0.0.1:8081;
proxy_pass http://127.0.0.01:8081;
}
# used to output connect.log
Expand Down
2 changes: 1 addition & 1 deletion t/http_proxy_connect_timeout.t
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ http {
}
location / {
proxy_pass http://127.0.0.1:8081;
proxy_pass http://127.0.0.01:8081;
}
# used to output connect.log
Expand Down

0 comments on commit 99202bf

Please sign in to comment.