Merge branch 'master' into fix/schema/1

apache · Oct 17, 2023 · d49d21b · d49d21b
2 parents f3ecf05 + 33ee8d6
commit d49d21b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
@@ -469,7 +469,7 @@ http {
         }
         apisix.http_init(args)
 
-        -- set apisix_lua_home into constans module
+        -- set apisix_lua_home into constants module
         -- it may be used by plugins to determine the work path of apisix
         local constants = require("apisix.constants")
         constants.apisix_lua_home = "{*apisix_lua_home*}"

diff --git a/apisix/init.lua b/apisix/init.lua
@@ -170,7 +170,7 @@ end
 
 
 function _M.http_exit_worker()
-    -- TODO: we can support stream plugin later - currently there is not `destory` method
+    -- TODO: we can support stream plugin later - currently there is not `destroy` method
     -- in stream plugins
     plugin.exit_worker()
     require("apisix.plugins.ext-plugin.init").exit_worker()

diff --git a/conf/config-default.yaml b/conf/config-default.yaml
@@ -76,7 +76,6 @@ apisix:
   # http is the default proxy mode. proxy_mode can be one of `http`, `stream`, or `http&stream`
   proxy_mode: http
   # stream_proxy:                 # TCP/UDP L4 proxy
-  #   only: true                  # Enable L4 proxy only without L7 proxy.
   #   tcp:
   #     - addr: 9100              # Set the TCP proxy listening ports.
   #       tls: true

diff --git a/docs/en/latest/plugins/response-rewrite.md b/docs/en/latest/plugins/response-rewrite.md
@@ -83,7 +83,7 @@ curl http://127.0.0.1:9180/apisix/admin/routes/1  -H 'X-API-KEY: edd1c9f034335f1
                 "set": {
                     "X-Server-id": 3,
                     "X-Server-status": "on",
-                    "X-Server-balancer_addr": "$balancer_ip:$balancer_port"
+                    "X-Server-balancer-addr": "$balancer_ip:$balancer_port"
                 }
             },
             "vars":[
@@ -107,7 +107,7 @@ Besides `set` operation, you can also `add` or `remove` response header like:
 ```json
 "headers": {
     "add": [
-        "X-Server-balancer_addr: $balancer_ip:$balancer_port"
+        "X-Server-balancer-addr: $balancer_ip:$balancer_port"
     ],
     "remove": [
         "X-TO-BE-REMOVED"
@@ -137,7 +137,7 @@ Transfer-Encoding: chunked
 Connection: keep-alive
 X-Server-id: 3
 X-Server-status: on
-X-Server-balancer_addr: 127.0.0.1:80
+X-Server-balancer-addr: 127.0.0.1:80
 
 {"code":"ok","message":"new json body"}
 ```
@@ -170,7 +170,7 @@ curl http://127.0.0.1:9180/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
         "set": {
             "X-Server-id":3,
             "X-Server-status":"on",
-            "X-Server-balancer_addr":"$balancer_ip:$balancer_port"
+            "X-Server-balancer-addr":"$balancer_ip:$balancer_port"
         }
       },
       "filters":[

diff --git a/docs/zh/latest/plugins/response-rewrite.md b/docs/zh/latest/plugins/response-rewrite.md
@@ -84,7 +84,7 @@ curl http://127.0.0.1:9180/apisix/admin/routes/1 \
                 "set": {
                     "X-Server-id": 3,
                     "X-Server-status": "on",
-                    "X-Server-balancer_addr": "$balancer_ip:$balancer_port"
+                    "X-Server-balancer-addr": "$balancer_ip:$balancer_port"
                 }
             },
             "vars":[
@@ -108,7 +108,7 @@ curl http://127.0.0.1:9180/apisix/admin/routes/1 \
 ```json
 "headers": {
     "add": [
-        "X-Server-balancer_addr: $balancer_ip:$balancer_port"
+        "X-Server-balancer-addr: $balancer_ip:$balancer_port"
     ],
     "remove": [
         "X-TO-BE-REMOVED"
@@ -138,7 +138,7 @@ Transfer-Encoding: chunked
 Connection: keep-alive
 X-Server-id: 3
 X-Server-status: on
-X-Server-balancer_addr: 127.0.0.1:80
+X-Server-balancer-addr: 127.0.0.1:80
 
 {"code":"ok","message":"new json body"}
 ```
@@ -169,7 +169,7 @@ curl http://127.0.0.1:9180/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
         "set": {
             "X-Server-id":3,
             "X-Server-status":"on",
-            "X-Server-balancer_addr":"$balancer_ip:$balancer_port"
+            "X-Server-balancer-addr":"$balancer_ip:$balancer_port"
         }
       },
       "filters":[

diff --git a/t/APISIX.pm b/t/APISIX.pm
@@ -524,7 +524,7 @@ _EOC_
     }
     apisix.http_init(args)
 
-    -- set apisix_lua_home into constans module
+    -- set apisix_lua_home into constants module
     -- it may be used by plugins to determine the work path of apisix
     local constants = require("apisix.constants")
     constants.apisix_lua_home = "$apisix_home"