Skip to content

Commit e45de32

Browse files
committed
v3
1 parent bef329b commit e45de32

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

lib/resty/apisix/upstream.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ffi.cdef([[
1414
typedef intptr_t ngx_int_t;
1515
ngx_int_t ngx_http_apisix_upstream_set_cert_and_key(ngx_http_request_t *r, void *cert, void *key);
1616
ngx_int_t ngx_http_apisix_upstream_set_ssl_trusted_store(ngx_http_request_t *r, void *store);
17-
int ngx_http_apisix_set_upstream_ssl_verify(ngx_http_request_t *r, int verify);
17+
int ngx_http_apisix_upstream_set_ssl_verify(ngx_http_request_t *r, int verify);
1818
]])
1919
local _M = {}
2020

@@ -71,15 +71,15 @@ end
7171
_M.set_ssl_trusted_store = set_ssl_trusted_store
7272

7373

74-
local set_upstream_ssl_verify
74+
local set_ssl_verify
7575
do
7676
local ALLOWED_PHASES = {
7777
['rewrite'] = true,
7878
['balancer'] = true,
7979
['access'] = true,
8080
['preread'] = true,
8181
}
82-
function set_upstream_ssl_verify(verify)
82+
function set_ssl_verify(verify)
8383
if not ALLOWED_PHASES[get_phase()] then
8484
error("API disabled in the current context", 2)
8585
end
@@ -90,7 +90,7 @@ do
9090

9191
local r = get_request()
9292

93-
local ret = C.ngx_http_apisix_set_upstream_ssl_verify(
93+
local ret = C.ngx_http_apisix_upstream_set_ssl_verify(
9494
r, verify)
9595
if ret == NGX_OK then
9696
return true
@@ -103,7 +103,7 @@ do
103103
error("unknown return code: " .. tostring(ret))
104104
end
105105
end
106-
_M.set_upstream_ssl_verify = set_upstream_ssl_verify
106+
_M.set_ssl_verify = set_ssl_verify
107107

108108

109109
return _M

src/ngx_http_apisix_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ ngx_http_apisix_set_upstream_ssl(ngx_http_request_t *r, ngx_connection_t *c)
386386

387387

388388
int
389-
ngx_http_apisix_set_upstream_ssl_verify(ngx_http_request_t *r, int verify)
389+
ngx_http_apisix_upstream_set_ssl_verify(ngx_http_request_t *r, int verify)
390390
{
391391
ngx_http_apisix_ctx_t *ctx;
392392

t/upstream_ssl_verify.t

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ __DATA__
5353
location /t {
5454
access_by_lua_block {
5555
local upstream = require("resty.apisix.upstream")
56-
local ok, err = upstream.set_upstream_ssl_verify(true)
56+
local ok, err = upstream.set_ssl_verify(true)
5757
if not ok then
58-
ngx.log(ngx.ERR, "set_upstream_ssl_verify failed: ", err)
58+
ngx.log(ngx.ERR, "set_ssl_verify failed: ", err)
5959
ngx.exit(500)
6060
end
6161
}
@@ -74,9 +74,9 @@ upstream SSL certificate verify error: (20:unable to get local issuer certificat
7474
location /t {
7575
access_by_lua_block {
7676
local upstream = require("resty.apisix.upstream")
77-
local ok, err = upstream.set_upstream_ssl_verify(false)
77+
local ok, err = upstream.set_ssl_verify(false)
7878
if not ok then
79-
ngx.log(ngx.ERR, "set_upstream_ssl_verify failed: ", err)
79+
ngx.log(ngx.ERR, "set_ssl_verify failed: ", err)
8080
ngx.exit(500)
8181
end
8282
}
@@ -95,9 +95,9 @@ ok
9595
location /t {
9696
access_by_lua_block {
9797
local upstream = require("resty.apisix.upstream")
98-
local ok, err = upstream.set_upstream_ssl_verify(true)
98+
local ok, err = upstream.set_ssl_verify(true)
9999
if not ok then
100-
ngx.log(ngx.ERR, "set_upstream_ssl_verify failed: ", err)
100+
ngx.log(ngx.ERR, "set_ssl_verify failed: ", err)
101101
ngx.exit(500)
102102
end
103103
}
@@ -118,7 +118,7 @@ ok
118118
location /t {
119119
content_by_lua_block {
120120
local upstream = require("resty.apisix.upstream")
121-
upstream.set_upstream_ssl_verify(true)
121+
upstream.set_ssl_verify(true)
122122
}
123123
}
124124
--- error_code: 500
@@ -133,22 +133,22 @@ API disabled in the current context
133133
rewrite_by_lua_block {
134134
local upstream = require("resty.apisix.upstream")
135135
ngx.status = 500
136-
local ok, _ = pcall(upstream.set_upstream_ssl_verify, 1)
136+
local ok, _ = pcall(upstream.set_ssl_verify, 1)
137137
if not ok then
138138
ngx.say("invalid argument type: number")
139139
end
140140
141-
local ok, _ = pcall(upstream.set_upstream_ssl_verify, "true")
141+
local ok, _ = pcall(upstream.set_ssl_verify, "true")
142142
if not ok then
143143
ngx.say("invalid argument type: string")
144144
end
145145
146-
local ok, err = pcall(upstream.set_upstream_ssl_verify, nil)
146+
local ok, err = pcall(upstream.set_ssl_verify, nil)
147147
if not ok then
148148
ngx.say("invalid argument type: nil")
149149
end
150150
151-
local ok, err = pcall(upstream.set_upstream_ssl_verify, {})
151+
local ok, err = pcall(upstream.set_ssl_verify, {})
152152
if not ok then
153153
ngx.say("invalid argument type: table")
154154
end
@@ -188,9 +188,9 @@ invalid argument type: table
188188
ngx.exit(500)
189189
end
190190
191-
local ok, err = upstream.set_upstream_ssl_verify(false)
191+
local ok, err = upstream.set_ssl_verify(false)
192192
if not ok then
193-
ngx.log(ngx.ERR, "set_upstream_ssl_verify failed: ", err)
193+
ngx.log(ngx.ERR, "set_ssl_verify failed: ", err)
194194
ngx.exit(500)
195195
end
196196
}
@@ -255,9 +255,9 @@ ok
255255
ngx.exit(500)
256256
end
257257
258-
local ok, err = upstream.set_upstream_ssl_verify(true)
258+
local ok, err = upstream.set_ssl_verify(true)
259259
if not ok then
260-
ngx.log(ngx.ERR, "set_upstream_ssl_verify failed: ", err)
260+
ngx.log(ngx.ERR, "set_ssl_verify failed: ", err)
261261
ngx.exit(500)
262262
end
263263
}

0 commit comments

Comments
 (0)