Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions nginx/ngx_http_js_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -5843,17 +5843,11 @@ ngx_http_qjs_subrequest_done(ngx_http_request_t *r, void *data, ngx_int_t rc)

cx = ctx->engine->u.qjs.ctx;

if (!JS_IsObject(ngx_qjs_arg(sctx->args[0]))) {
reply = ngx_http_qjs_request_make(cx, NGX_QJS_CLASS_ID_HTTP_REQUEST, r);
if (JS_IsException(reply)) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"js subrequest reply creation failed");
return NGX_ERROR;
}


} else {
reply = JS_DupValue(cx, ngx_qjs_arg(sctx->args[0]));
reply = ngx_http_qjs_request_make(cx, NGX_QJS_CLASS_ID_HTTP_REQUEST, r);
if (JS_IsException(reply)) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"js subrequest reply creation failed");
return NGX_ERROR;
}

rc = ngx_qjs_call(cx, event->function, &reply, 1);
Expand Down
4 changes: 2 additions & 2 deletions src/njs.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include <njs_auto_config.h>

#define NJS_VERSION "0.9.3"
#define NJS_VERSION_NUMBER 0x000903
#define NJS_VERSION "0.9.4"
#define NJS_VERSION_NUMBER 0x000904


#include <string.h>
Expand Down