hongzhidao

diff -r 5bc9788b05ec src/nxt_http_variables.c
--- a/src/nxt_http_variables.c  Mon Dec 11 10:46:58 2023 +0800
+++ b/src/nxt_http_variables.c  Tue Dec 26 15:29:01 2023 +0800
@@ -14,6 +14,8 @@
     void *ctx, void *data);
 static nxt_int_t nxt_http_var_method(nxt_task_t *task, nxt_str_t *str,
     void *ctx, void *data);
+static nxt_int_t nxt_http_var_scheme(nxt_task_t *task, nxt_str_t *str,
+    void *ctx, void *data);
 static nxt_int_t nxt_http_var_request_uri(nxt_task_t *task, nxt_str_t *str,

hongzhidao

diff -r a732c6661312 src/nxt_h1proto.c
--- a/src/nxt_h1proto.c Wed Nov 29 10:28:44 2023 -0500
+++ b/src/nxt_h1proto.c Wed Dec 06 10:41:17 2023 +0800
@@ -651,6 +651,9 @@
     u_char     *m;
     nxt_int_t  ret;

+    r->unparsed_uri.start = h1p->parser.target_start;
+    r->unparsed_uri.length = h1p->parser.target_end - h1p->parser.target_start;
+

hongzhidao

# HG changeset patch
# User Zhidao HONG <z.hong@f5.com>
# Date 1687163362 -28800
#      Mon Jun 19 16:29:22 2023 +0800
# Node ID 86dabd80ce1f7fccac51f9232ec04198556fc8e7
# Parent  0d708d831d9fa78c9f6d0e840992486fb685bd4f
Variables refactoring.

diff -r 0d708d831d9f -r 86dabd80ce1f src/nxt_http_variables.c
--- a/src/nxt_http_variables.c	Wed Jun 14 18:30:40 2023 +0100

hongzhidao

diff -r ea6d4e2a6460 nginx/ngx_js_shared_dict.c
--- a/nginx/ngx_js_shared_dict.c        Thu Jun 15 16:19:20 2023 -0700
+++ b/nginx/ngx_js_shared_dict.c        Fri Jun 16 13:50:57 2023 +0800
@@ -89,7 +89,7 @@
 static ngx_int_t ngx_js_dict_get(njs_vm_t *vm, ngx_js_dict_t *dict,
     njs_str_t *key, njs_value_t *retval);
 static ngx_int_t ngx_js_dict_incr(ngx_js_dict_t *dict, njs_str_t *key,
-    njs_value_t *by, njs_value_t *init, double *value);
+    njs_value_t *delta, njs_value_t *init, double *value);
 static ngx_int_t ngx_js_dict_delete(ngx_js_dict_t *dict, njs_str_t *key);

hongzhidao

diff -r 09951503ac64 nginx/ngx_js_shared_dict.c
--- a/nginx/ngx_js_shared_dict.c        Wed Jun 14 23:00:10 2023 -0700
+++ b/nginx/ngx_js_shared_dict.c        Fri Jun 16 00:13:31 2023 +0800
@@ -78,7 +78,7 @@
     njs_str_t *key);

 static ngx_int_t ngx_js_dict_add(ngx_js_dict_t *dict, njs_str_t *key,
-    njs_value_t *value, ngx_msec_t expire);
+    njs_value_t *value, ngx_msec_t now);
 static ngx_int_t ngx_js_dict_get(njs_vm_t *vm, ngx_js_dict_t *dict,

hongzhidao

diff -r 09951503ac64 nginx/ngx_js_shared_dict.c
--- a/nginx/ngx_js_shared_dict.c        Wed Jun 14 23:00:10 2023 -0700
+++ b/nginx/ngx_js_shared_dict.c        Thu Jun 15 19:03:20 2023 +0800
@@ -78,7 +78,7 @@
     njs_str_t *key);

 static ngx_int_t ngx_js_dict_add(ngx_js_dict_t *dict, njs_str_t *key,
-    njs_value_t *value, ngx_msec_t expire);
+    njs_value_t *value);
 static ngx_int_t ngx_js_dict_get(njs_vm_t *vm, ngx_js_dict_t *dict,

hongzhidao

diff -r 1fd5ef2fb985 nginx/ngx_js_shared_dict.c
--- a/nginx/ngx_js_shared_dict.c        Tue Jun 13 22:58:15 2023 -0700
+++ b/nginx/ngx_js_shared_dict.c        Thu Jun 15 10:24:27 2023 +0800
@@ -73,19 +73,19 @@

 static ngx_int_t ngx_js_dict_add(ngx_js_dict_t *dict, njs_str_t *key,
     njs_value_t *value, ngx_msec_t expire);
-static ngx_int_t ngx_js_dict_get(ngx_shm_zone_t *shm_zone, njs_vm_t *vm,
+static ngx_int_t ngx_js_dict_get(ngx_js_dict_t *dict, njs_vm_t *vm,
     njs_str_t *key, njs_value_t *retval);

hongzhidao

# User Zhidao HONG <z.hong@f5.com>
# Date 1663779678 -28800
#      Thu Sep 22 01:01:18 2022 +0800
# Node ID f57e9f89c3568c9150ca7a69c24ad3964859fa7d
# Parent  6b6b979e821420bba206c717b68e0420d01ab010
Status: fixed error connection statistics.

When proxy is used, the number of accepted connections is not counted,
This also results in the wrong number of active connections.

hongzhidao

diff -r bb0bd4a80464 src/nxt_http.h
--- a/src/nxt_http.h    Thu Jul 28 16:10:32 2022 +0200
+++ b/src/nxt_http.h    Tue Aug 23 11:39:06 2022 +0800
@@ -182,6 +182,8 @@
     nxt_event_engine_t              *engine;
     nxt_work_t                      err_work;

+    nxt_nsec_t                      start_time;
+
     nxt_http_response_t             resp;

hongzhidao

# HG changeset patch
# User Zhidao HONG <z.hong@f5.com>
# Date 1652966305 -28800
#      Thu May 19 21:18:25 2022 +0800
# Node ID a016e01489562d0f3f49794d155b4d11d7012f43
# Parent  c8fd41f564cf54e82381ab1165fed636bb5ef20f
HTTP: generalized uri encoding.

No functional changes.