]> git.kaiwu.me - njs.git/commitdiff
HTTP: fixed stub_status statistic when js_periodic is enabled.
authorDmitry Volyntsev <xeioex@nginx.com>
Thu, 1 Feb 2024 01:06:58 +0000 (17:06 -0800)
committerDmitry Volyntsev <xeioex@nginx.com>
Thu, 1 Feb 2024 01:06:58 +0000 (17:06 -0800)
Previously, when js_periodic is enabled the Reading statistic
was growing each time the js_periodic handler was called.

The issue was introduced in f1bd0b1db065 (0.8.1).

This fixes #692 issue on Github.

nginx/ngx_http_js_module.c

index 327f0f28b909e117a98b6f62fbf98b1377b5385f..bd77e85373a408675a05265adbab94a1c258d912 100644 (file)
@@ -4323,30 +4323,24 @@ ngx_http_js_periodic_finalize(ngx_http_request_t *r, ngx_int_t rc)
 static void
 ngx_http_js_periodic_destroy(ngx_http_request_t *r, ngx_js_periodic_t *periodic)
 {
-    ngx_connection_t    *c;
-    ngx_http_cleanup_t  *cln;
+    ngx_connection_t  *c;
 
     c = r->connection;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http js periodic destroy: \"%V\"",
-                   &periodic->method);
+                   "http js periodic destroy: \"%V\"", &periodic->method);
 
     periodic->connection = NULL;
 
-    for (cln = r->cleanup; cln; cln = cln->next) {
-        if (cln->handler) {
-            cln->handler(cln->data);
-        }
-    }
+    r->logged = 1;
+
+    ngx_http_free_request(r, NGX_OK);
 
     ngx_free_connection(c);
 
     c->fd = (ngx_socket_t) -1;
     c->pool = NULL;
     c->destroyed = 1;
-
-    ngx_destroy_pool(r->pool);
 }