From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Wed, 18 Sep 2024 02:17:09 +0000 (-0700)
Subject: HTTP: fixed r.subrequest() check for nested subrequests.
X-Git-Tag: 0.8.6~3
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c2bc8c6501b1712f75ea6a82a153383d3d3d2017;p=njs.git

HTTP: fixed r.subrequest() check for nested subrequests.

The issue was introduced in a14be61c86 (0.8.5).

This fixes #783 on Github.
---

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 4a50a949..dec65198 100644
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -3358,7 +3358,7 @@ ngx_http_js_ext_subrequest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_js_module);
 
-    if (r->main != r) {
+    if (r->subrequest_in_memory) {
         njs_vm_error(vm, "subrequest can only be created for "
                          "the primary request");
         return NJS_ERROR;
@@ -5722,7 +5722,7 @@ ngx_http_qjs_ext_subrequest(JSContext *cx, JSValueConst this_val,
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_js_module);
 
-    if (r->main != r) {
+    if (r->subrequest_in_memory) {
         return JS_ThrowTypeError(cx, "subrequest can only be created for "
                                      "the primary request");
     }