Merge branch 'openresty:master' into master

tests: fixed failed test introduced by commit ad33f56e91.
changes: remove the pcre2 disable config.
2024-10-13 00:29:41 +00:00 · 2024-04-25 02:06:01 +08:00 · 2024-01-13 10:16:10 +08:00 · 2024-01-12 22:13:21 +08:00 · 2024-01-09 22:59:56 -08:00 · 2024-01-07 06:05:26 +08:00
8 changed files with 1593 additions and 1350 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,17 +113,14 @@ env:
    - OPENSSL_INC=$OPENSSL_PREFIX/include
    - 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 ENABLE_HTTP3_OPTION=--with-http_v3_module
+    - OPENSSL_VER=1.1.1w 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 ENABLE_HTTP3_OPTION=--with-http_v3_module
+          env: OPENSSL_VER=1.1.1w 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 ENABLE_HTTP3_OPTION=--with-http_v3_module
+          env: OPENSSL_VER=1.1.1w 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)
--- a/45
+++ b/45
@@ -0,0 +1,45 @@
+#By GarfieldWTF
+# Use an official Alpine Linux as the parent image
+FROM alpine:latest
+
+# Set environment variables for OpenResty and NGINX versions
+ENV OPENRESTY_VERSION 1.21.4.2
+ENV NGINX_VERSION 1.25.3
+
+# Install required packages and build dependencies
+RUN apk update && apk upgrade && apk add --no-cache \
+    build-base \
+    pcre-dev \
+    openssl-dev \
+    zlib-dev \
+    wget \
+    perl-dev \
+    libxslt-dev \
+    gd-dev \
+    geoip-dev
+
+# Download and extract the source code for OpenResty and NGINX
+RUN wget https://openresty.org/download/openresty-$OPENRESTY_VERSION.tar.gz -O openresty.tar.gz \
+    && wget https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -O nginx.tar.gz \
+    && tar -xzvf openresty.tar.gz \
+    && tar -xzvf nginx.tar.gz
+
+# Build OpenResty and NGINX with OpenResty modules
+RUN cd openresty-$OPENRESTY_VERSION \
+    && ./configure --with-pcre-jit --with-ipv6 --with-http_ssl_module --with-http_realip_module --with-http_addition_module --with-http_sub_module --with-http_dav_module --with-http_flv_module --with-http_mp4_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module --with-http_secure_link_module --with-http_stub_status_module --with-http_auth_request_module --with-threads --with-stream --with-stream_ssl_module --with-mail --with-mail_ssl_module --with-cc-opt="-O2 -fstack-protector-strong -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2" --with-ld-opt="-Wl,-z,relro -Wl,--as-needed" --prefix=/usr/local/openresty \
+    && make \
+    && make install
+
+# Cleanup
+RUN rm -rf openresty-$OPENRESTY_VERSION nginx-$NGINX_VERSION \
+    && rm openresty.tar.gz nginx.tar.gz
+
+# Add OpenResty to the system PATH
+ENV PATH="/usr/local/openresty/bin:${PATH}"
+
+# Expose ports if needed
+EXPOSE 80
+EXPOSE 443
+
+# Optional: Set a default CMD to start OpenResty when the container runs
+CMD ["nginx", "-g", "daemon off;"]
--- a/html/50x.html
+++ b/html/50x.html
--- a/html/index.html
+++ b/html/index.html
--- a/t/000-sanity.t
+++ b/t/000-sanity.t
--- a/util/build-win32.sh
+++ b/util/build-win32.sh
@@ -1,13 +1,13 @@
 #!/bin/bash

 PCRE=pcre-8.45
-ZLIB=zlib-1.2.13
-OPENSSL=openssl-1.1.1t
+ZLIB=zlib-1.3
+OPENSSL=openssl-1.1.1w
 JOBS=12

-# wget https://www.openssl.org/source/openssl-1.1.1p.tar.gz
-# wget http://zlib.net/zlib-1.2.12.tar.gz
-# wget https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.gz
+# wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
+# wget http://zlib.net/zlib-1.3.tar.gz
+# wget https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.gz

 rm -rf objs || exit 1
 mkdir -p objs/lib || exit 1
--- a/util/configure
+++ b/util/configure
@@ -554,9 +554,6 @@ _END_
            "\n";
    }

-    # disable pcre2 by default
-    push @ngx_opts, '--without-pcre2';
-
    if (!$opts->{no_stream}
        && ! $opts->{no_stream_ssl}
        && ! $opts->{stream_ssl})
@@ -779,8 +776,8 @@ _END_
        }

        if ($on_solaris) {
-            $extra_opts .= " INSTALL_X='$root_dir/build/install -m 0755' " .
-                    "INSTALL_F='$root_dir/build/install -m 0644'";
+            $extra_opts .= " INSTALL_X='\$(INSTALL) -m 0755' " .
+                    "INSTALL_F='\$(INSTALL) -m 0644'";
        }

        if (defined $cc) {
@@ -953,7 +950,7 @@ _EOC_
            }

            if ($on_solaris) {
-                #$extra_opts .= " INSTALL=$root_dir/build/install";
+                #$extra_opts .= " INSTALL='\$(INSTALL)'";
                if ($opts->{debug}) {
                    $extra_opts .=
                        " CJSON_CFLAGS=\"-g -O -fpic -DUSE_INTERNAL_ISINF\"";
@@ -997,7 +994,7 @@ _EOC_
                "LUA_LIB_DIR=$lualib_prefix";

            if ($on_solaris) {
-                $extra_opts .= " INSTALL=$root_dir/build/install";
+                $extra_opts .= " INSTALL='\$(INSTALL)'";
            }

            if ($opts->{debug}) {
@@ -1050,7 +1047,7 @@ _EOC_
            }

            if ($on_solaris) {
-                $extra_opts .= " INSTALL=$root_dir/build/install";
+                $extra_opts .= " INSTALL='\$(INSTALL)'";
                if ($opts->{debug}) {
                    $extra_opts .= " CFLAGS=\"-g -O -Wall\"";
                }
@@ -1101,7 +1098,7 @@ _EOC_
            }

            if ($on_solaris) {
-                $extra_opts .= " INSTALL=$root_dir/build/install";
+                $extra_opts .= " INSTALL='\$(INSTALL)'";
                if ($opts->{debug}) {
                    $extra_opts .= " CFLAGS=\"-g -O -Wall\"";

@@ -1149,8 +1146,10 @@ _EOC_
        } else {
            $target_dir = "\$(DESTDIR)$prefix/bin/";
        }
-        push @make_install_cmds, "cd $root_dir/build/$opm_dir && "
-             . "$root_dir/build/install bin/* $target_dir";
+        push @make_install_cmds,
+            "mkdir '$target_dir'",
+            "cd $root_dir/build/$opm_dir && "
+                . "\$(INSTALL) bin/* '$target_dir'";
    }

    # configure resty-cli:
@@ -1164,7 +1163,7 @@ _EOC_
            $target_dir = "\$(DESTDIR)$prefix/bin/";
        }
        push @make_install_cmds, "cd $root_dir/build/$resty_cli_dir && "
-             . "$root_dir/build/install bin/* $target_dir";
+             . "\$(INSTALL) bin/* $target_dir";

        if ($platform ne 'msys') {
            # patch the resty script:
@@ -1247,7 +1246,7 @@ sub add_lua_lib ($$$) {

        my $extra_opts =
        " DESTDIR=\$(DESTDIR) LUA_LIB_DIR=$lualib_prefix"
-        ." INSTALL=$root_dir/build/install";
+        ." INSTALL='\$(INSTALL)'";

        push @make_install_cmds, "cd $root_dir/build/$dir && " .
        "\$(MAKE) install$extra_opts";
@@ -1560,7 +1559,12 @@ sub gen_makefile {
        print $out "DESTDIR ?= $root_dir/\n\n";
    }

-    print $out ".PHONY: all install clean\n\n";
+    print $out <<_EOC_;
+INSTALL := $root_dir/build/install
+
+.PHONY: all install clean
+
+_EOC_

    print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";

--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -585,7 +585,7 @@ mv openresty-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1

 #################################

-ver=0.36
+ver=0.37
 $root/util/get-tarball "https://github.com/openresty/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
 tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
 mv openresty-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
@@ -599,7 +599,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1

 #################################

-ver=0.10.25
+ver=0.10.26
 $root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
 mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
@@ -613,7 +613,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1

 #################################

-ver=0.0.13
+ver=0.0.14
 $root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
 mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
@@ -627,7 +627,7 @@ mv openresty-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1

 #################################

-ver=0.19
+ver=0.20
 $root/util/get-tarball "https://github.com/openresty/memc-nginx-module/tarball/v$ver" -O memc-nginx-module-$ver.tar.gz || exit 1
 tar -xzf memc-nginx-module-$ver.tar.gz || exit 1
 mv openresty-memc-nginx-module-* memc-nginx-module-$ver || exit 1
@@ -669,10 +669,30 @@ mv openresty-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ve
 #mv ngx_http_upstream_keepalive-* upstream-keepalive-nginx-module-$ver || exit 1

 #################################
-ver=0.4.0.1
-$root/util/get-tarball "https://github.com/openresty/ngx_http_redis/tarball/v$ver" -O ngx_http_redis-$ver.tar.gz || exit 1
-tar -xzf ngx_http_redis-$ver.tar.gz || exit 1
-mv openresty-ngx_http_redis-* ngx_http_redis-$ver || exit 1
+
+ver=0.3.9
+$root/util/get-tarball "https://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
+tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
+mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
+
+cd redis-nginx-module-$ver
+echo "applying ngx_http_redis-$ver-variables_in_redis_pass.patch"
+patch -p1 < $root/patches/ngx_http_redis-$ver-variables_in_redis_pass.patch || exit 1
+
+echo
+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 ..

 #################################

@@ -705,7 +725,7 @@ resty_cli=resty-cli-$ver

 #################################

-ver=0.0.7
+ver=0.0.8
 $root/util/get-tarball "https://github.com/openresty/opm/tarball/v$ver" -O opm-$ver.tar.gz || exit 1
 tar -xzf opm-$ver.tar.gz || exit 1
 mv openresty-opm-* opm-$ver || exit 1
@@ -777,7 +797,7 @@ mv openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1

 #################################

-ver=0.26
+ver=0.27
 $root/util/get-tarball "https://github.com/openresty/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
 mv openresty-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
@@ -854,7 +874,7 @@ cd ..

 #################################

-ver=0.1.27
+ver=0.1.28
 $root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-core-$ver.tar.gz || exit 1
 mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1
Author	SHA1	Message	Date
garfieldwtf	0a443848ea	Merge branch 'openresty:master' into master	2024-04-25 02:06:01 +08:00
lijunlong	7b7fcbe078	tests: fixed failed test introduced by commit `ad33f56e91`.	2024-01-13 10:16:10 +08:00
swananan	478d980900	changes: remove the pcre2 disable config.	2024-01-12 22:13:21 +08:00
Yichun Zhang (agentzh)	ad33f56e91	change: Makefile: added new INSTALL variable that can be overridden from the make command line. Also fixed compatibility with Android Termux's install utility.	2024-01-09 22:59:56 -08:00
garfieldwtf	158343aa16	Merge branch 'openresty:master' into master	2024-01-07 06:05:26 +08:00
Johnny Wang	8978f0426f	formal release 1.25.3.1. (#952 )	2024-01-04 11:43:38 +08:00
ruoyidero	a71e039a0d	updated the default index page and 50x error page. (#949 )	2024-01-04 10:57:01 +08:00
Johnny Wang	8760b0af4a	win32: upgraded deps openssl to 1.1.1w and zlib to 1.3. (#950 )	2023-12-31 10:02:42 +08:00
lijunlong	6fe9e3f7e6	feature: release openresty-1.25.3rc1. Co-authored-by: jiahao <wangjiahao@openresty.com>	2023-12-29 16:14:01 +08:00
garfieldwtf	d315cade6f	Update Dockerfile	2023-11-02 22:42:35 +08:00
garfieldwtf	f87345b52d	Create Dockerfile	2023-11-01 19:12:10 +08:00