bumped version to 1.25.1.1
This commit is contained in:
swananan
parent
849cac1bdf
commit
fd922993f9
12
.travis.yml
12
.travis.yml
|
|
@ -46,7 +46,7 @@ _linux-s390x: &linux-s390x
|
|||
script:
|
||||
- util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- cd "openresty-$(./util/ver)"
|
||||
- ./configure --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- ./configure $ENABLE_HTTP3_OPTION --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- sudo make install > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- cd ..
|
||||
|
|
@ -85,7 +85,7 @@ _linux-ppc64le: &linux-ppc64le
|
|||
script:
|
||||
- util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- cd "openresty-$(./util/ver)"
|
||||
- ./configure --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- ./configure $ENABLE_HTTP3_OPTION --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- sudo make install > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- cd ..
|
||||
|
|
@ -110,16 +110,16 @@ env:
|
|||
- OPENRESTY_PREFIX=/opt/openresty
|
||||
jobs:
|
||||
- OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
|
||||
- OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f
|
||||
- OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- <<: *linux-s390x
|
||||
env: OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
|
||||
- <<: *linux-s390x
|
||||
env: OPENSSL_VER=1.1.1l OPENSSL_PATCH_VER=1.1.1f
|
||||
env: OPENSSL_VER=1.1.1l OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
- <<: *linux-ppc64le
|
||||
env: OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f
|
||||
env: OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
|
||||
install:
|
||||
- cpanm --sudo --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
|
||||
|
|
@ -143,7 +143,7 @@ install:
|
|||
script:
|
||||
- util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- cd "openresty-$(./util/ver)"
|
||||
- ./configure --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- ./configure $ENABLE_HTTP3_OPTION --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- sudo make install > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- cd ..
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/ngx_http_redis_module.c b/ngx_http_redis_module.c
|
||||
index 23c8084..404acb2 100644
|
||||
--- a/ngx_http_redis_module.c
|
||||
+++ b/ngx_http_redis_module.c
|
||||
@@ -614,9 +614,6 @@ found:
|
||||
ngx_str_set(&h->key, "Content-Encoding");
|
||||
ngx_str_set(&h->value, "gzip");
|
||||
h->lowcase_key = (u_char*) "content-encoding";
|
||||
-#if (NGX_HTTP_GZIP)
|
||||
- u->headers_in.content_encoding = h;
|
||||
-#endif
|
||||
}
|
||||
|
||||
/* try to find end of string */
|
||||
492
t/000-sanity.t
492
t/000-sanity.t
File diff suppressed because it is too large
Load Diff
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 ..
|
||||
|
||||
#################################
|
||||
|
|
|
|||
Loading…
Reference in New Issue