Merged with the default branch.

diff --cc auto/options
index d9873f462f2e83f60a748551bed0eaea7a93287d,48f3a1a4251b4523dd27d3c4227994adad350bab..ced563806bad0567d2aaabf511869d5d33b5e8fa
--- 1/auto/options
--- 2/auto/options
+++ b/auto/options
@@@ -150,9 -146,9 +150,10 @@@ PCRE=NON
  PCRE_OPT=
  PCRE_CONF_OPT=
  PCRE_JIT=NO
+ PCRE2=YES
  
  USE_OPENSSL=NO
 +USE_OPENSSL_QUIC=NO
  OPENSSL=NONE
  
  USE_ZLIB=NO

diff --cc src/core/ngx_connection.h
Simple merge

diff --cc src/event/ngx_event.h
Simple merge

diff --cc src/event/ngx_event_openssl.c
Simple merge

diff --cc src/http/ngx_http_core_module.c
Simple merge