|
| 1 | +diff --git a/bundle/nginx-1.25.3/src/http/modules/ngx_http_ssl_module.c b/bundle/nginx-1.25.3/src/http/modules/ngx_http_ssl_module.c |
| 2 | +index 1c92d9f..232a279 100644 |
| 3 | +--- a/bundle/nginx-1.25.3/src/http/modules/ngx_http_ssl_module.c |
| 4 | ++++ b/bundle/nginx-1.25.3/src/http/modules/ngx_http_ssl_module.c |
| 5 | +@@ -8,6 +8,9 @@ |
| 6 | + #include <ngx_config.h> |
| 7 | + #include <ngx_core.h> |
| 8 | + #include <ngx_http.h> |
| 9 | ++#if (NGX_HTTP_LUA_KONG) |
| 10 | ++#include <ngx_http_lua_kong_module.h> |
| 11 | ++#endif |
| 12 | + |
| 13 | + #if (NGX_QUIC_OPENSSL_COMPAT) |
| 14 | + #include <ngx_event_quic_openssl_compat.h> |
| 15 | +@@ -473,8 +476,11 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out, |
| 16 | + { |
| 17 | + #if (NGX_HTTP_V2) |
| 18 | + h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module); |
| 19 | +- |
| 20 | ++#if (NGX_HTTP_LUA_KONG) |
| 21 | ++ if(ngx_http_lua_kong_ssl_get_http2_alpn_enabled(c->ssl, h2scf->enable || hc->addr_conf->http2)) { |
| 22 | ++#else |
| 23 | + if (h2scf->enable || hc->addr_conf->http2) { |
| 24 | ++#endif |
| 25 | + srv = (unsigned char *) NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS; |
| 26 | + srvlen = sizeof(NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS) - 1; |
| 27 | + |
| 28 | +diff --git a/bundle/ngx_lua-0.10.26/src/ngx_http_lua_ssl.h b/bundle/ngx_lua-0.10.26/src/ngx_http_lua_ssl.h |
| 29 | +index 3d577c6..aa20f03 100644 |
| 30 | +--- a/bundle/ngx_lua-0.10.26/src/ngx_http_lua_ssl.h |
| 31 | ++++ b/bundle/ngx_lua-0.10.26/src/ngx_http_lua_ssl.h |
| 32 | +@@ -38,6 +38,9 @@ typedef struct { |
| 33 | + unsigned entered_client_hello_handler:1; |
| 34 | + unsigned entered_cert_handler:1; |
| 35 | + unsigned entered_sess_fetch_handler:1; |
| 36 | ++#if (NGX_HTTP_LUA_KONG) |
| 37 | ++ unsigned disable_http2_alpn:1; |
| 38 | ++#endif |
| 39 | + } ngx_http_lua_ssl_ctx_t; |
| 40 | + |
| 41 | + |
0 commit comments