If tnt_pass is down, then status should be passed to the client.

Author: dedok

src/ngx_http_tnt_eval_module.c

@@ -56,8 +56,9 @@ typedef struct {
 typedef struct {
     ngx_http_tnt_eval_loc_conf_t   *base_conf;
     ngx_http_variable_value_t      **values;
-    unsigned int                   done:1;
-    unsigned int                   in_progress:1;
+    ngx_int_t                      status;
+    ngx_int_t                      done:1;
+    ngx_int_t                      in_progress:1;
 
     /* A reference to the main request */
     ngx_http_request_t             *r;
@@ -206,6 +207,14 @@ ngx_http_tnt_eval_handler(ngx_http_request_t *r)
 
     if (ctx->done) {
         dd("subrequest done, r = %p, ctx = %p", r, ctx);
+
+        /** If tnt_pass is down, then status should be passed to the client.
+         * 0 meas that upstream works
+         */
+        if (ctx->status != 0) {
+            return ctx->status;
+        }
+
         return NGX_DECLINED;
     }
 
@@ -310,6 +319,8 @@ ngx_http_tnt_eval_post_subrequest_handler(ngx_http_request_t *r, void *data,
 
     ctx->done = 1;
 
+    ctx->status = rc;
+
 #if 0
     /* work-around a bug in the nginx core (ngx_http_named_location)
      */
@@ -827,15 +838,15 @@ ngx_http_tnt_eval_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     clcf = ctx->loc_conf[ngx_http_core_module.ctx_index];
 
-    name.len = sizeof("/eval_") - 1 + NGX_OFF_T_LEN;
+    name.len = sizeof("/tnt_eval_") - 1 + NGX_OFF_T_LEN;
 
     name.data = ngx_palloc(cf->pool, name.len);
 
     if (name.data == NULL) {
         return NGX_CONF_ERROR;
     }
 
-    name.len = ngx_sprintf(name.data, "/eval_%O", (off_t)(uintptr_t) clcf)
+    name.len = ngx_sprintf(name.data, "/tnt_eval_%O", (off_t)(uintptr_t) clcf)
                - name.data;
 
     clcf->loc_conf = ctx->loc_conf;

src/ngx_http_tnt_version.h

@@ -33,6 +33,6 @@
 #ifndef NGX_HTTP_TNT_VERSION_H
 #define NGX_HTTP_TNT_VERSION_H 1
 
-#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.4.3"
+#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.4.4-beta"
 
 #endif

test/eval_basic.py

@@ -124,6 +124,7 @@ def do_get(url, code, headers):
 
 # =============
 #
-print('[+] Test headers codes')
-
+print('[+] Test headers')
+loc = BASE_URL + '/eval_headers'
+result = post_success(loc, {'params': []}, {'in_h': 1}, default_print_f)
 print('[+] OK')

test/ngx_confs/tnt_server_test.conf

@@ -317,5 +317,18 @@ http {
       tnt_pass tnt;
     }
 
+    location /eval_headers {
+      tnt_eval_buffer_size 1m;
+      tnt_eval $tnt_status $tnt_res {
+        tnt_buffer_size 1m;
+        tnt_pass_http_request on parse_args;
+        tnt_http_rest_methods all;
+        tnt_method test_eval_headers;
+        tnt_pass tnt;
+      }
+      add_header 'X-t' $tnt_status;
+      return 200 $tnt_res;
+    }
+
    }
 }

test/test.lua

@@ -157,6 +157,25 @@ function test_eval(req, ...)
     out
 end
 
+function test_eval_headers(req, ...)
+
+  local headers = {}
+
+  for i = 1, 10 do
+    headers['H' .. tostring(i)] = tostring(i)
+  end
+
+  return
+    {
+      __ngx = {
+        200,
+        headers
+      }
+    },
+    req,
+    ...
+end
+
 -- CFG
 box.cfg {
     log_level = 5;