Commit 132704ab authored by Christos Trochalakis's avatar Christos Trochalakis
Browse files

http-lua: Upgrade to 0.10.15

parent 85ba8454
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Files-Excluded: .gitignore .gitattributes .travis.yml

Module: http-lua
Homepage: https://github.com/openresty/lua-nginx-module
Version: 0.10.13
Version: 0.10.15
Patch:
  openssl-1.1.0.patch
  discover-luajit-2.1.patch
+173 −62

File changed.

Preview size limit exceeded, changes collapsed.

+45 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ HTTP_LUA_SRCS=" \
            $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
            $ngx_addon_dir/src/ngx_http_lua_ssl.c \
            $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
            $ngx_addon_dir/src/ngx_http_lua_input_filters.c \
            $ngx_addon_dir/src/ngx_http_lua_pipe.c \
            "

HTTP_LUA_DEPS=" \
@@ -422,6 +424,8 @@ HTTP_LUA_DEPS=" \
            $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
            $ngx_addon_dir/src/ngx_http_lua_ssl.h \
            $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
            $ngx_addon_dir/src/ngx_http_lua_input_filters.h \
            $ngx_addon_dir/src/ngx_http_lua_pipe.h \
            "

CFLAGS="$CFLAGS -DNDK_SET_VAR"
@@ -474,6 +478,17 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'

. auto/feature

ngx_feature="SA_RESTART"
ngx_feature_libs=
ngx_feature_name="NGX_HTTP_LUA_HAVE_SA_RESTART"
ngx_feature_run=no
ngx_feature_incs="#include <signal.h>"
ngx_feature_path=
ngx_feature_test='struct sigaction act;
                  act.sa_flags |= SA_RESTART;'

. auto/feature

ngx_feature="__attribute__(constructor)"
ngx_feature_libs=
ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
@@ -512,6 +527,36 @@ CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"

# ----------------------------------------

ngx_feature="pipe2"
ngx_feature_libs=
ngx_feature_name="NGX_HTTP_LUA_HAVE_PIPE2"
ngx_feature_run=no
ngx_feature_incs="#include <fcntl.h>"
ngx_feature_test="int fd[2]; pipe2(fd, O_CLOEXEC|O_NONBLOCK);"
SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"

. auto/feature

CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"

# ----------------------------------------

ngx_feature="signalfd"
ngx_feature_libs=
ngx_feature_name="NGX_HTTP_LUA_HAVE_SIGNALFD"
ngx_feature_run=no
ngx_feature_incs="#include <sys/signalfd.h>"
ngx_feature_test="sigset_t set; signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);"
SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"

. auto/feature

CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"

# ----------------------------------------

if test -n "$ngx_module_link"; then
    ngx_module_type=HTTP_AUX_FILTER
    ngx_module_name=$ngx_addon_name
+159 −54

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
/* Public API for other Nginx modules */


#define ngx_http_lua_version  10013
#define ngx_http_lua_version  10015


typedef struct {
Loading