From 9d34233ff431850111d3a5fcc1ebae7310fd9e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Nagy?= Date: Mon, 23 May 2016 23:29:53 +0200 Subject: [PATCH 1/3] Test with nginx 1.8.1, 1.9.15, 1.10.0 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dcc9332..a42eec8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ compiler: env: # At least try stable and mainline versions - - NGINX=1.9.11 + - NGINX=1.10.0 + - NGINX=1.9.15 - NGINX=1.8.1 # Also, the oldest supported version # TODO: Fails building because it won't find IOV_MAX from header. From 7ca820ec4d15402d0e3736de1c4d93cf08dc1079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Nagy?= Date: Mon, 23 May 2016 23:38:00 +0200 Subject: [PATCH 2/3] Test dynamic module build --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a42eec8..4037faf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ compiler: env: # At least try stable and mainline versions - - NGINX=1.10.0 - - NGINX=1.9.15 - - NGINX=1.8.1 + - NGINX=1.10.0 TYPE=dynamic + - NGINX=1.9.15 TYPE=dynamic + - NGINX=1.8.1 TYPE=static # Also, the oldest supported version # TODO: Fails building because it won't find IOV_MAX from header. #- NGINX=0.7.69 @@ -26,5 +26,5 @@ cache: ccache script: | wget -O - http://nginx.org/download/nginx-${NGINX}.tar.gz | tar -xzf - cd nginx-${NGINX} - ./configure --add-module=.. --with-http_addition_module + if [[ ${TYPE} = "dynamic" ]] ; then ./configure --add-dynamic-module=.. --with-http_addition_module ; else ./configure --add-module=.. --with-http_addition_module ; fi make From 0e5f7c00b6ed1f1bdfcb1fc828480fd44285d1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Nagy?= Date: Mon, 23 May 2016 23:39:24 +0200 Subject: [PATCH 3/3] Dynamic module config --- config | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/config b/config index 9a2a416..e62cafb 100644 --- a/config +++ b/config @@ -1,12 +1,19 @@ # vim:ft=sh: ngx_addon_name=ngx_http_fancyindex_module -# XXX: Insert fancyindex module *after* index module! -# -HTTP_MODULES=`echo "${HTTP_MODULES}" | sed -e \ - 's/ngx_http_index_module/ngx_http_fancyindex_module ngx_http_index_module/'` -NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fancyindex_module.c" +if test -n "$ngx_module_link"; then + ngx_module_type=HTTP + ngx_module_name=ngx_http_fancyindex_module + ngx_module_srcs="$ngx_addon_dir/ngx_http_fancyindex_module.c" -if [ $HTTP_ADDITION != YES ] ; then - echo " - The 'addition' filter is needed for fancyindex_{header,footer}, but it was disabled" + . auto/module +else + # XXX: Insert fancyindex module *after* index module! + # + HTTP_MODULES=`echo "${HTTP_MODULES}" | sed -e \ + 's/ngx_http_index_module/ngx_http_fancyindex_module ngx_http_index_module/'` + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fancyindex_module.c" + if [ $HTTP_ADDITION != YES ] ; then + echo " - The 'addition' filter is needed for fancyindex_{header,footer}, but it was disabled" + fi fi