feature: upgrade nginx core to 1.25.1 which supports HTTP3.

This commit is contained in:
swananan
2023-08-05 22:28:24 +08:00
committed by lijunlong
parent cf8c2f827e
commit 6278b1aeae
42 changed files with 3096 additions and 252 deletions

5
util/configure vendored
View File

@ -554,6 +554,9 @@ _END_
"\n";
}
# disable pcre2 by default
push @ngx_opts, '--without-pcre2';
if (!$opts->{no_stream}
&& ! $opts->{no_stream_ssl}
&& ! $opts->{stream_ssl})
@ -1382,6 +1385,7 @@ Options directly inherited from nginx
--with-http_ssl_module enable ngx_http_ssl_module (default on)
--with-http_v2_module enable ngx_http_v2_module
--with-http_v3_module enable ngx_http_v3_module
--with-http_realip_module enable ngx_http_realip_module
--with-http_addition_module enable ngx_http_addition_module
--with-http_xslt_module enable ngx_http_xslt_module
@ -1511,6 +1515,7 @@ Options directly inherited from nginx
--with-pcre=DIR set path to PCRE library sources
--with-pcre-opt=OPTIONS set additional build options for PCRE
--with-pcre-jit build PCRE with JIT compilation support
--without-pcre2 do not use PCRE2 library
--with-zlib=DIR set path to zlib library sources
--with-zlib-opt=OPTIONS set additional build options for zlib

View File

@ -674,6 +674,14 @@ echo "applying ngx_http_redis-$ver-default_port_fix.patch"
patch -p1 < $root/patches/ngx_http_redis-$ver-default_port_fix.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.23.0`
if [ "$answer" = "Y" ]; then
echo
echo "applying ngx_http_redis-$ver-remove_content_encoding.patch"
patch -p1 < $root/patches/ngx_http_redis-$ver-remove_content_encoding.patch || exit 1
echo
fi
cd ..
#################################

View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.21.4
minor_ver=2
main_ver=1.25.1
minor_ver=1
version=$main_ver.$minor_ver
echo $version