feat: release 2.12.1 (#6254)

Co-authored-by: Zeping Bai <bzp2010@apache.org>

Author: spacewander

.github/workflows/chaos.yml

@@ -54,7 +54,7 @@ jobs:
         run: |
           curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
           helm repo add bitnami https://charts.bitnami.com/bitnami
-          helm install etcd bitnami/etcd --set replicaCount=3 --set auth.rbac.enabled=false
+          helm install etcd bitnami/etcd --set replicaCount=3 --set auth.rbac.create=false
           kubectl wait pods -l app.kubernetes.io/instance=etcd --for=condition=Ready --timeout=300s --all
 
 

CHANGELOG.md

@@ -23,6 +23,7 @@ title: Changelog
 
 ## Table of Contents
 
+- [2.12.1](#2121)
 - [2.12.0](#2120)
 - [2.11.0](#2110)
 - [2.10.3](#2103)
@@ -51,6 +52,13 @@ title: Changelog
 - [0.7.0](#070)
 - [0.6.0](#060)
 
+## 2.12.1
+
+### Bugfix
+
+- fix(batch-requests): real ip header should be overridden [#6251](https://github.com/apache/apisix/pull/6251)
+- fix(batch-requests): should be disabled by default [#6204](https://github.com/apache/apisix/pull/6204)
+
 ## 2.12.0
 
 ### Change

apisix/core/version.lua

@@ -15,5 +15,5 @@
 -- limitations under the License.
 --
 return {
-    VERSION = "2.12.0"
+    VERSION = "2.12.1"
 }

apisix/plugins/batch-requests.lua

@@ -165,6 +165,8 @@ local function set_common_header(data)
     local local_conf = core.config.local_conf()
     local real_ip_hdr = core.table.try_read_attr(local_conf, "nginx_config", "http",
                                                  "real_ip_header")
+    -- we don't need to handle '_' to '-' as Nginx won't treat 'X_REAL_IP' as 'X-Real-IP'
+    real_ip_hdr = str_lower(real_ip_hdr)
 
     local outer_headers = core.request.headers(nil)
     for i,req in ipairs(data.pipeline) do

conf/config-default.yaml

@@ -329,7 +329,7 @@ plugins:                          # plugin list (sorted by priority)
   - request-id                     # priority: 11010
   - fault-injection                # priority: 11000
   - serverless-pre-function        # priority: 10000
-  - batch-requests                 # priority: 4010
+  #- batch-requests                # priority: 4010
   - cors                           # priority: 4000
   - ip-restriction                 # priority: 3000
   - ua-restriction                 # priority: 2999

docs/en/latest/config.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.12.0",
+  "version": "2.12.1",
   "sidebar": [
     {
       "type": "category",

docs/en/latest/how-to-build.md

@@ -81,10 +81,10 @@ Please refer to: [Installing Apache APISIX with Helm Chart](https://github.com/a
 
 ### Installation via Source Release Package
 
-1. Create a directory named `apisix-2.12.0`.
+1. Create a directory named `apisix-2.12.1`.
 
   ```shell
-  $ APISIX_VERSION='2.12.0'
+  $ APISIX_VERSION='2.12.1'
   $ mkdir apisix-${APISIX_VERSION}
   ```
 

docs/zh/latest/CHANGELOG.md

@@ -23,6 +23,7 @@ title: CHANGELOG
 
 ## Table of Contents
 
+- [2.12.1](#2121)
 - [2.12.0](#2120)
 - [2.11.0](#2110)
 - [2.10.3](#2103)
@@ -51,6 +52,13 @@ title: CHANGELOG
 - [0.7.0](#070)
 - [0.6.0](#060)
 
+## 2.12.1
+
+### Bugfix
+
+- batch-requests 插件应当覆盖 real ip 请求头 [#6251](https://github.com/apache/apisix/pull/6251)
+- batch-requests 插件应当默认不启用 [#6204](https://github.com/apache/apisix/pull/6204)
+
 ## 2.12.0
 
 ### Change

docs/zh/latest/config.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.12.0",
+  "version": "2.12.1",
   "sidebar": [
     {
       "type": "category",

docs/zh/latest/how-to-build.md

@@ -81,10 +81,10 @@ $ sudo yum install ./apisix/*.rpm
 
 ### 通过源码包安装
 
-1. 创建一个名为 `apisix-2.12.0` 的目录。
+1. 创建一个名为 `apisix-2.12.1` 的目录。
 
   ```shell
-  $ APISIX_VERSION='2.12.0'
+  $ APISIX_VERSION='2.12.1'
   $ mkdir apisix-${APISIX_VERSION}
   ```