fix: incorrect upstream_response_time when nginx returns 499 (#11)

fix #10

Author: kingluo

src/ngx_http_lua_var_module.c

@@ -111,22 +111,19 @@ ngx_http_lua_var_ffi_upstream_response_time(ngx_http_request_t *r,
     state = r->upstream_states->elts;
 
     for ( ;; ) {
-        if (state[i].status) {
+        if (type == 1) {
+            ms = state[i].header_time;
 
-            if (type == 1 && state[i].header_time != (ngx_msec_t) -1) {
-                ms = state[i].header_time;
+        } else if (type == 2) {
+            ms = state[i].connect_time;
 
-            } else if (type == 2 && state[i].connect_time != (ngx_msec_t) -1) {
-                ms = state[i].connect_time;
-
-            } else {
-                ms = state[i].response_time;
-            }
-
-            ms = ngx_max(ms, 0);
-            total_ms = total_ms + ms;
+        } else {
+            ms = state[i].response_time;
         }
 
+        ms = ngx_max(ms, 0);
+        total_ms = total_ms + ms;
+
         if (++i == r->upstream_states->nelts) {
             break;
         }

t/upstream_response_time_bugfix.t

@@ -0,0 +1,38 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua 'no_plan';
+
+repeat_each(1);
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ignore the client abort event in the user callback
+--- config
+    location /t {
+        proxy_pass http://127.0.0.1:$server_port/delay;
+        log_by_lua_block {
+            local var = require("resty.ngxvar")
+            local req = var.request()
+            ngx.log(ngx.NOTICE, "validate upstream_response_time: ", tonumber(var.fetch("upstream_response_time", req)) > 0)
+        }
+    }
+    location = /delay {
+        content_by_lua_block {
+            ngx.sleep(2)
+        }
+    }
+--- request
+GET /t
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.7
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+validate upstream_response_time: true