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.

Sign up for GitHub

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

Xxm404/change iterate method. close #1685 #1717

Merged
merged 8 commits into from
Jun 16, 2020
Merged

Xxm404/change iterate method. close #1685 #1717

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
349aca8
Fix doc json format error.
superxxm Mar 31, 2020
244ae11
Merge remote-tracking branch 'upstream/master'
superxxm May 19, 2020
b0447d8
Fix garbled Chinese response in browser.
superxxm May 19, 2020
e2d9932
Fix document description does not match source code.
xxm404 May 29, 2020
677f03e
Change: use to scan the items in etcd. close #1685
xxm404 Jun 15, 2020
619b06b
Resolved conflict.
xxm404 Jun 15, 2020
114ce55
Resolved conflict.
xxm404 Jun 15, 2020
5e2dd76
Add ipairs.
xxm404 Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apisix/http/router/radixtree_sni.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ local get_request = require("resty.core.base").get_request
local radixtree_new = require("resty.radixtree").new
local core = require("apisix.core")
local ngx_ssl = require("ngx.ssl")
local ipairs = ipairs
local config_util = require("apisix.core.config_util")
local ipairs = ipairs
local type = type
local error = error
local str_find = string.find
Expand Down Expand Up @@ -52,9 +53,8 @@ local function create_router(ssl_items)
local aes_128_cbc_with_iv = (type(iv)=="string" and #iv == 16) and
assert(aes:new(iv, nil, aes.cipher(128, "cbc"), {iv=iv})) or nil

for _, ssl in ipairs(ssl_items) do
if type(ssl) == "table" and
ssl.value ~= nil and
for _, ssl in config_util.iterate_values(ssl_items) do
if ssl.value ~= nil and
(ssl.value.status == nil or ssl.value.status == 1) then -- compatible with old version

local j = 0
Expand Down