fix apisix may lost port when forward host to upstream

apache · Jan 26, 2021 · 2ad03af · 2ad03af
1 parent 3db8ebe
commit 2ad03af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
@@ -317,7 +317,7 @@ http {
         # admin configuration snippet ends
 
         set $upstream_scheme             'http';
-        set $upstream_host               $host;
+        set $upstream_host               $http_host;
         set $upstream_uri                '';
 
         location /apisix/admin {
@@ -410,7 +410,7 @@ http {
         # http server configuration snippet ends
 
         set $upstream_scheme             'http';
-        set $upstream_host               $host;
+        set $upstream_host               $http_host;
         set $upstream_uri                '';
         set $ctx_ref                     '';
 

diff --git a/benchmark/fake-apisix/conf/nginx.conf b/benchmark/fake-apisix/conf/nginx.conf
@@ -84,7 +84,7 @@ http {
 
         location / {
             set $upstream_scheme             'http';
-            set $upstream_host               $host;
+            set $upstream_host               $http_host;
             set $upstream_upgrade            '';
             set $upstream_connection         '';
             set $upstream_uri                '';

diff --git a/t/APISIX.pm b/t/APISIX.pm
@@ -480,7 +480,7 @@ _EOC_
         }
 
         set \$upstream_scheme             'http';
-        set \$upstream_host               \$host;
+        set \$upstream_host               \$http_host;
         set \$upstream_uri                '';
         set \$ctx_ref                     '';
         set \$dubbo_service_name          '';