aboutsummaryrefslogtreecommitdiff
path: root/nginx/ngx_js.c
diff options
context:
space:
mode:
authorDmitry Volyntsev <xeioex@nginx.com>2024-10-11 17:23:42 -0700
committerDmitry Volyntsev <xeioexception@gmail.com>2024-10-14 16:51:54 -0700
commit685b64f0326ac63a1deda3c9bdad61ad521990a7 (patch)
treee5eed03f39d1f1cad1f8191fd7674dbe4bf3670e /nginx/ngx_js.c
parent6902aaa17d8a2f30c44f2ed0ed165605233a2c6d (diff)
downloadnjs-685b64f0326ac63a1deda3c9bdad61ad521990a7.tar.gz
njs-685b64f0326ac63a1deda3c9bdad61ad521990a7.zip
Modules: removed extra VMs creation when it is not needed.
Previously, a new VM instance was created for every location. This is not needed and consumes a lot of memory for large configurations. Instead, if no new js_import is introduced on the location level server level VM should be used. The issue was introduced in 9b674412 (0.8.6). This fixes #795 issue on Github.
Diffstat (limited to 'nginx/ngx_js.c')
-rw-r--r--nginx/ngx_js.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nginx/ngx_js.c b/nginx/ngx_js.c
index 98e48dc2..152045f0 100644
--- a/nginx/ngx_js.c
+++ b/nginx/ngx_js.c
@@ -3360,7 +3360,7 @@ ngx_js_merge_vm(ngx_conf_t *cf, ngx_js_loc_conf_t *conf,
ngx_js_named_path_t *import, *pi, *pij, *preload;
if (conf->imports == NGX_CONF_UNSET_PTR
- && conf->type == NGX_CONF_UNSET_UINT
+ && conf->type == prev->type
&& conf->paths == NGX_CONF_UNSET_PTR
&& conf->preload_objects == NGX_CONF_UNSET_PTR)
{