use yes or y values for the variable to enable persistent upstrand contexts

Author: lyokha

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        nginx: [1.16.1, 1.18.0, 1.20.2, 1.22.1, 1.24.0, 1.26.2]
+        nginx: [1.16.1, 1.18.0, 1.20.2, 1.22.1, 1.24.0, 1.26.3]
         nginx-easy-context: ['1.0']
         experimental: [false]
         include:
@@ -56,7 +56,7 @@ jobs:
                -O "nginx-easy-context-$NGXEASYCTXVER.tar.gz" &&
                   tar xzvf "nginx-easy-context-$NGXEASYCTXVER.tar.gz"
           cd nginx-${NGXVER}/
-          NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX=1 \
+          NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX=yes \
           $NGX_CONFIGURE --add-module=../nginx-easy-context-$NGXEASYCTXVER \
               --add-module=.. --add-module=../echo-nginx-module
           make -j2

README.md

@@ -417,16 +417,12 @@ in the Nginx configuration file.
 To benefit from persistent request contexts and upstrand failover locations with
 internal redirections in them (*try_files*, *error_page* etc.), download module
 [nginx-easy-context](https://github.com/lyokha/nginx-easy-context) in some
-directory, uncomment line
-
-```sh
-# NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX=1
-```
-
-in file *config* in directory of this module and then run *configure* with two
-options *--add-module*.
+directory, set environment variable
+*NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX* to *y* or *yes*,
+and run *configure* with two options *--add-module*.
 
 ```ShellSession
+$ NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX=yes
 $ ./configure --add-module=/path/to/module/nginx-easy-context --add-module=/path/to/this/module
 ```
 

config

@@ -1,11 +1,15 @@
 ngx_addon_name=ngx_http_combined_upstreams_module
 
-# uncomment next line to enable correct behavior of upstrand interception
-# locations with internal redirections, e.g. error_page or try_files
-# NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX=1
-
-if test -n "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX"
+if [ "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX" = y ] ||
+   [ "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX" = yes ]
 then
+    if [ "$ngx_easy_context_dir" = "" ]
+    then
+        echo "$0: error: unable to find nginx-easy-context module!"
+        echo "   Make sure that it was specified in one of --add-module "`
+            `"or --add-dynamic-module options before this module"
+        exit 1
+    fi
     ngx_module_incs="$ngx_easy_context_dir"
     NGX_EASY_CONTEXT_INC="$ngx_easy_context_dir/ngx_easy_context.h"
 else
@@ -23,31 +27,15 @@ NGX_HTTP_COMBINED_UPSTREAMS_MODULE_SRCS="                                   \
         $ngx_addon_dir/src/ngx_http_combined_upstreams_upstrand.c           \
         "
 
-if test -n "$ngx_module_link"
-then
-    ngx_module_type=HTTP_AUX_FILTER
-    ngx_module_name=$ngx_addon_name
-    ngx_module_deps="$NGX_HTTP_COMBINED_UPSTREAMS_MODULE_DEPS"
-    ngx_module_srcs="$NGX_HTTP_COMBINED_UPSTREAMS_MODULE_SRCS"
-
-    if test -n "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX"
-    then
-        ngx_module_incs="$ngx_easy_context_dir"
-    fi
-
-    . auto/module
-else
-    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
-    NGX_ADDON_DEPS="$NGX_ADDON_SRCS $NGX_HTTP_CUSTOM_COUNTERS_MODULE_DEPS"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $NGX_HTTP_CUSTOM_COUNTERS_MODULE_SRCS"
+ngx_module_type=HTTP_AUX_FILTER
+ngx_module_name=$ngx_addon_name
+ngx_module_deps="$NGX_HTTP_COMBINED_UPSTREAMS_MODULE_DEPS"
+ngx_module_srcs="$NGX_HTTP_COMBINED_UPSTREAMS_MODULE_SRCS"
 
-    if test -n "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX"
-    then
-        CFLAGS="$CFLAGS -I$ngx_easy_context_dir"
-    fi
-fi
+. auto/module
 
-if test -n "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX"
+if [ "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX" = y ] ||
+   [ "$NGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX" = yes ]
 then
     CFLAGS="$CFLAGS "`
         `"-DNGX_HTTP_COMBINED_UPSTREAMS_PERSISTENT_UPSTRAND_INTERCEPT_CTX"