Skip to content

Commit 19587ed

Browse files
tzssangglassleslie-tsangspacewander
authored
feat: release 2.10.2 (#5521)
Co-authored-by: leslie <[email protected]> Co-authored-by: 罗泽轩 <[email protected]>
1 parent be360b4 commit 19587ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1102
-78
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
paths-ignore:
77
- 'docs/**'
88
pull_request:
9-
branches: [master]
9+
branches: [master, 'release/**']
1010
paths-ignore:
1111
- 'docs/**'
1212

.github/workflows/centos7-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
paths-ignore:
77
- 'docs/**'
88
pull_request:
9-
branches: [master]
9+
branches: [master, 'release/**']
1010
paths-ignore:
1111
- 'docs/**'
1212

.github/workflows/chaos.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: Chaos Test
22

33
on:
44
pull_request:
5-
branches:
6-
- master
5+
branches: [master, 'release/**']
76
paths-ignore:
87
- 'docs/**'
98

.github/workflows/code-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Code Lint
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches: [master, 'release/**']
66
paths-ignore:
77
- 'docs/**'
88

.github/workflows/doc-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Doc Lint
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches: [master, 'release/**']
66
paths:
77
- '**/*.md'
88

.github/workflows/fuzzing-ci.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: fuzzing
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [master, 'release/**']
76
paths-ignore:
87
- 'docs/**'
98
pull_request:
10-
branches:
11-
- master
9+
branches: [master, 'release/**']
1210
paths-ignore:
1311
- 'docs/**'
1412

.github/workflows/license-checker.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ name: License checker
2020

2121
on:
2222
push:
23-
branches:
24-
- master
23+
branches: [master, 'release/**']
2524
pull_request:
26-
branches:
27-
- master
25+
branches: [master, 'release/**']
2826

2927
jobs:
3028
check-license:

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ title: Changelog
2323

2424
## Table of Contents
2525

26+
- [2.10.2](#2102)
2627
- [2.10.1](#2101)
2728
- [2.10.0](#2100)
2829
- [2.9.0](#290)
@@ -47,6 +48,23 @@ title: Changelog
4748
- [0.7.0](#070)
4849
- [0.6.0](#060)
4950

51+
## 2.10.2
52+
53+
### Bugfix
54+
55+
- fix: response.set_header should remove header like request.set_header [#5499](https://github.com/apache/apisix/pull/5499)
56+
- fix(batch-requests): correct the client ip in the pipeline [#5476](https://github.com/apache/apisix/pull/5476)
57+
- fix(upstream): load imbalance when it's referred by multiple routes [#5462](https://github.com/apache/apisix/pull/5462)
58+
- fix(hmac-auth): check if the X-HMAC-ALGORITHM header is missing [#5467](https://github.com/apache/apisix/pull/5467)
59+
- fix: prevent being hacked by untrusted request_uri [#5458](https://github.com/apache/apisix/pull/5458)
60+
- fix(admin): modify boolean parameters with PATCH [#5434](https://github.com/apache/apisix/pull/5432)
61+
- fix(traffic-split): multiple rules with multiple weighted_upstreams under each rule cause upstream_key duplicate [#5414](https://github.com/apache/apisix/pull/5414)
62+
- fix: add handler for invalid basic auth header values [#5419](https://github.com/apache/apisix/pull/5419)
63+
64+
### Change
65+
66+
- change: log insensitive consumer info only [#5445](https://github.com/apache/apisix/pull/5445)
67+
5068
## 2.10.1
5169

5270
### Bugfix

apisix/admin/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ local function run()
157157

158158
if req_body then
159159
local data, err = core.json.decode(req_body)
160-
if not data then
160+
if err then
161161
core.log.error("invalid request body: ", req_body, " err: ", err)
162162
core.response.exit(400, {error_msg = "invalid request body: " .. err,
163163
req_body = req_body})

apisix/admin/routes.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ function _M.patch(id, conf, sub_path, args)
247247
return 400, {error_msg = "missing route id"}
248248
end
249249

250-
if not conf then
250+
if conf == nil then
251251
return 400, {error_msg = "missing new configuration"}
252252
end
253253

0 commit comments

Comments
 (0)