chore: merge master

2 months ago · 585cd5ae8e
parent 99af045d2a
commit 585cd5ae8e
1 changed files with 13 additions and 0 deletions
--- a/patches/nginx/1.29.2/nginx-1.29.2-quic_ssl_lua_yield.patch
+++ b/patches/nginx/1.29.2/nginx-1.29.2-quic_ssl_lua_yield.patch
@ -1,3 +1,16 @@
+diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
+index 707ab216b..bd787c74e 100644
+--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
+@@ -18,6 +18,8 @@
+ #endif
+ 
+ 
+#define HAVE_QUIC_SSL_LUA_YIELD_PATCH  1
+
+ #if (NGX_FREEBSD)
+ #include <ngx_freebsd_config.h>
+ 
 diff --git a/src/event/quic/ngx_event_quic.c b/src/event/quic/ngx_event_quic.c
 index 6a59aaf93..08605ff24 100644
 --- a/src/event/quic/ngx_event_quic.c