bugfix: fixed nginx-1.27.1-stream_ssl_preread_no_skip.patch.

pull/1027/head
lijunlong 3 months ago
parent 83c39d2cc8
commit 279c5cf91a

@ -1,10 +1,15 @@
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
index e3d11fd9..3717b5fe 100644 index 3fc83ff2f..7e65d65be 100644
--- a/src/stream/ngx_stream_ssl_preread_module.c --- a/src/stream/ngx_stream_ssl_preread_module.c
+++ b/src/stream/ngx_stream_ssl_preread_module.c +++ b/src/stream/ngx_stream_ssl_preread_module.c
@@ -159,7 +159,7 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s) @@ -190,11 +190,11 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
}
if (rc == NGX_OK) {
- return ngx_stream_ssl_preread_servername(s, &ctx->host);
+ rc = ngx_stream_ssl_preread_servername(s, &ctx->host);
}
rc = ngx_stream_ssl_preread_parse_record(ctx, p, p + len);
if (rc != NGX_AGAIN) { if (rc != NGX_AGAIN) {
- return rc; - return rc;
+ return rc == NGX_OK ? NGX_DECLINED : rc; + return rc == NGX_OK ? NGX_DECLINED : rc;

@ -975,8 +975,8 @@ cd $root/work/ || exit 1
if [ -d nginx.org ]; then if [ -d nginx.org ]; then
if [ -f nginx.org/.git/config ];then if [ -f nginx.org/.git/config ];then
cd nginx.org/ || exit 1 cd nginx.org/ || exit 1
git pull || exit 1
git checkout -f || exit 1 git checkout -f || exit 1
git pull || exit 1
cd .. cd ..
else else
rm -rf nginx.org || exit 1 rm -rf nginx.org || exit 1

Loading…
Cancel
Save