Skip to content

Commit bf4a5b1

Browse files
committed
refactor(patches): remove disable_h2_alpn as not needed anymore
Signed-off-by: Aapo Talvensaari <[email protected]>
1 parent c4df981 commit bf4a5b1

9 files changed

+1
-74
lines changed

.requirements

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LIBEXPAT_SHA256=fd03b7172b3bd7427a3e7a812063f74754f24542429b634e0db6511b53fb2278
1515

1616
# Note: git repositories can be loaded from local path if path is set as value
1717

18-
LUA_KONG_NGINX_MODULE=cd41aaa260eb54ec8f4c55b755b62351853b20fb # 0.15.1
18+
LUA_KONG_NGINX_MODULE=3f305911823301a98a12ec6ecdd9070b8ebe499b # 0.18.0
1919
LUA_RESTY_LMDB=9da0e9f3313960d06e2d8e718b7ac494faa500f1 # 1.6.0
2020
LUA_RESTY_EVENTS=bc85295b7c23eda2dbf2b4acec35c93f77b26787 # 0.3.1
2121
LUA_RESTY_SIMDJSON=176755a45f128fd4b3069c1bdee24d14bfb6900a # 1.2.0

build/openresty/patches/nginx-1.27.1_10-ssl-disable-h2-alpn.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

build/openresty/patches/ngx_lua-0.10.28_02-ssl-disable-h2-alpn.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

kong/pdk/client/tls.lua

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,25 +166,6 @@ local function new()
166166
ngx.ctx.CLIENT_VERIFY_OVERRIDE = v
167167
end
168168

169-
---
170-
-- Prevents the TLS handshake from negotiating HTTP/2 ALPN.
171-
-- if successful, the TLS handshake will not negotiate HTTP/2 ALPN to turn to HTTP1.1.
172-
--
173-
-- @function kong.client.tls.disable_http2_alpn
174-
-- @phases client_hello
175-
-- @treturn true|nil Returns `true` if successful, `nil` if it fails.
176-
-- @treturn nil|err Returns `nil` if successful, or an error message if it fails.
177-
--
178-
-- @usage
179-
-- local res, err = kong.client.tls.disable_http2_alpn()
180-
-- if not res then
181-
-- -- do something with err
182-
-- end
183-
function _TLS.disable_http2_alpn()
184-
check_phase(PHASES.client_hello)
185-
return kong_tls.disable_http2_alpn()
186-
end
187-
188169
return _TLS
189170
end
190171

t/01-pdk/14-client-tls/00-phase_checks.t

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,6 @@ qq{
118118
body_filter = "forced false",
119119
log = "forced false",
120120
admin_api = false,
121-
}, {
122-
method = "disable_http2_alpn",
123-
args = {},
124-
init_worker = false,
125-
client_hello = true,
126-
certificate = false,
127-
rewrite = false,
128-
access = false,
129-
header_filter = false,
130-
response = false,
131-
body_filter = false,
132-
log = false,
133-
admin_api = false,
134121
},
135122
}
136123

0 commit comments

Comments
 (0)