From db733d7e9e02539aab3004184d540cbbb36532d7 Mon Sep 17 00:00:00 2001 From: Karl Southern Date: Thu, 10 Aug 2017 17:39:39 +0100 Subject: [PATCH 1/2] Allows mod_zip to be compiled as a dynamic module. --- config | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/config b/config index daea9e2..5dd9c13 100644 --- a/config +++ b/config @@ -1,9 +1,17 @@ ngx_addon_name=ngx_http_zip_module -HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_zip_module" -NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_module.c" -NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_parsers.c" -NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_file.c" -NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_headers.c" + +if test -n "$ngx_module_link"; then + ngx_module_name=ngx_http_zip_module + ngx_module_srcs="$ngx_addon_dir/ngx_http_zip_module.c $ngx_addon_dir/ngx_http_zip_parsers.c $ngx_addon_dir/ngx_http_zip_file.c $ngx_addon_dir/ngx_http_zip_headers.c" + + . auto/module +else + HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_zip_module" + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_module.c" + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_parsers.c" + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_file.c" + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_headers.c" +fi ngx_feature="iconv_open()" ngx_feature_name="NGX_ZIP_HAVE_ICONV" From 5ae85b322cda18daf9cd01a81e3525dad2c3521d Mon Sep 17 00:00:00 2001 From: Karl Southern Date: Mon, 14 Aug 2017 10:55:59 +0100 Subject: [PATCH 2/2] Fixes tests so that they run as a static module --- config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config b/config index 5dd9c13..9f006ef 100644 --- a/config +++ b/config @@ -1,16 +1,18 @@ ngx_addon_name=ngx_http_zip_module -if test -n "$ngx_module_link"; then +if [ $ngx_module_link = DYNAMIC ] ; then ngx_module_name=ngx_http_zip_module ngx_module_srcs="$ngx_addon_dir/ngx_http_zip_module.c $ngx_addon_dir/ngx_http_zip_parsers.c $ngx_addon_dir/ngx_http_zip_file.c $ngx_addon_dir/ngx_http_zip_headers.c" . auto/module -else +elif [ $ngx_module_link = ADDON ] ; then HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_zip_module" NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_module.c" NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_parsers.c" NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_file.c" NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_zip_headers.c" + + . auto/module fi ngx_feature="iconv_open()"