Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: bugfix for v1.12 #173

Merged
merged 11 commits into from
Aug 3, 2023
Merged

backport: bugfix for v1.12 #173

merged 11 commits into from
Aug 3, 2023

Conversation

wklken
Copy link
Collaborator

@wklken wklken commented Aug 3, 2023

Description

Fixes # (issue)

Checklist

  • 填写 PR 描述及相关 issue (write PR description and related issue)
  • 代码风格检查通过 (code style check passed)
  • PR 中包含单元测试 (include unit test)
  • 单元测试通过 (unit test passed)
  • 本地开发联调环境验证通过 (local development environment verification passed)

wklken and others added 11 commits August 2, 2023 11:25
* fix: distribute fail
* 修复 allow_orgins 不建议为 None 的问题,为 None 时,apisix 将使用其默认值 *

* allow_origins 为空时,将其设置为 null

* 在 BkCorsConvertor 中统一转换 cors 数据
* bugfix: apis/web/permission
#171)

* fix(access_strategy/ip_restriction): only whitelist or blacklist, not both

* fix(ipv6/cidr): support ipv6 cidr like 0:0:0:0:0:ffff:192.1.1.1/96 in ip-restriction
@wklken wklken merged commit b1d290b into release/1.12 Aug 3, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants