Patch conflict `nginx_with_quic.patch` for 1.21.4

[CarterLi]

Mostly because Nginx mainline removes NPN support.

patching file auto/lib/conf
patching file auto/lib/make
patching file auto/lib/openssl/make
patching file auto/lib/quiche/conf
patching file auto/lib/quiche/make
patching file auto/make
patching file auto/modules
Hunk #1 succeeded at 118 (offset -1 lines).
Hunk #2 succeeded at 151 (offset -1 lines).
Hunk #3 succeeded at 213 (offset -1 lines).
Hunk #4 succeeded at 435 (offset -1 lines).
Hunk #5 succeeded at 1301 (offset -1 lines).
patching file auto/options
patching file src/core/ngx_connection.h
patching file src/core/ngx_core.h
patching file src/core/ngx_murmurhash.c
patching file src/core/ngx_murmurhash.h
patching file src/event/ngx_event_openssl.c
Hunk #1 succeeded at 1626 (offset 2 lines).
Hunk #2 succeeded at 2593 (offset 23 lines).
Hunk #3 succeeded at 2767 (offset 55 lines).
patching file src/event/ngx_event_openssl.h
Hunk #2 succeeded at 128 (offset 1 line).
Hunk #3 succeeded at 141 (offset 1 line).
patching file src/event/ngx_event_quic.c
patching file src/event/ngx_event_quic.h
patching file src/event/ngx_event_udp.c
patching file src/http/modules/ngx_http_ssl_module.c
Hunk #1 succeeded at 296 (offset -5 lines).
Hunk #2 succeeded at 456 (offset -2 lines).
Hunk #3 succeeded at 473 with fuzz 2 (offset -2 lines).
Hunk #4 succeeded at 483 with fuzz 2 (offset -4 lines).
Hunk #5 succeeded at 639 (offset -42 lines).
Hunk #6 succeeded at 719 (offset -42 lines).
Hunk #7 succeeded at 959 (offset -47 lines).
patching file src/http/modules/ngx_http_ssl_module.h
patching file src/http/ngx_http.c
Hunk #7 succeeded at 1737 (offset -1 lines).
Hunk #8 succeeded at 1824 (offset -1 lines).
Hunk #9 succeeded at 1863 (offset -1 lines).
Hunk #10 succeeded at 1931 (offset -1 lines).
patching file src/http/ngx_http_core_module.c
patching file src/http/ngx_http_core_module.h
patching file src/http/ngx_http.h
patching file src/http/ngx_http_request_body.c
patching file src/http/ngx_http_request.c
Hunk #3 FAILED at 823.
Hunk #4 succeeded at 832 with fuzz 2 (offset -1 lines).
Hunk #5 succeeded at 836 with fuzz 2 (offset -12 lines).
Hunk #6 succeeded at 1083 (offset -12 lines).
Hunk #7 succeeded at 2836 (offset -12 lines).
Hunk #8 succeeded at 3057 (offset -12 lines).
Hunk #9 succeeded at 3762 (offset -12 lines).
Hunk #10 succeeded at 3891 (offset -12 lines).
1 out of 10 hunks FAILED -- saving rejects to file src/http/ngx_http_request.c.rej
patching file src/http/ngx_http_request.h
patching file src/http/ngx_http_upstream.c
patching file src/http/v2/ngx_http_v2.c
patching file src/http/v2/ngx_http_v2_encode.c
patching file src/http/v2/ngx_http_v2_filter_module.c
patching file src/http/v2/ngx_http_v2.h
Hunk #1 succeeded at 51 (offset -1 lines).
Hunk #2 succeeded at 122 (offset -1 lines).
Hunk #3 succeeded at 183 (offset -1 lines).
Hunk #4 succeeded at 214 (offset -1 lines).
Hunk #5 succeeded at 262 (offset -1 lines).
Hunk #6 succeeded at 476 (offset -1 lines).
patching file src/http/v2/ngx_http_v2_table.c
patching file src/http/v3/ngx_http_v3.c
patching file src/http/v3/ngx_http_v3_filter_module.c
patching file src/http/v3/ngx_http_v3.h
patching file src/http/v3/ngx_http_v3_module.c
patching file src/http/v3/ngx_http_v3_module.h
patching file src/os/unix/ngx_udp_sendmsg_chain.c

Test pass: 1.21.4 with cloudflare/quiche@af1bbc0

Did you really test it?

[kn007]

hmm, my server auto test it with script... i will check it later. thanks for your reminder. sorry about that.

[kn007]

Update. Pls using the latest version to test.

[CarterLi]

I just moved back to openssl to try kTLS support ;)