From 38325eb8b373314793819968988bdf4ca25b3df7 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Thu, 9 Oct 2025 15:57:44 -0700 Subject: [PATCH] Fetch: introduced port and protocol helper macros. --- nginx/ngx_js_fetch.c | 6 +++--- nginx/ngx_js_http.h | 4 ++++ nginx/ngx_qjs_fetch.c | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/nginx/ngx_js_fetch.c b/nginx/ngx_js_fetch.c index 6a785df1..b652ef27 100644 --- a/nginx/ngx_js_fetch.c +++ b/nginx/ngx_js_fetch.c @@ -558,7 +558,7 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, http->max_response_body_size = http->conf->max_response_body_size; #if (NGX_SSL) - if (u.default_port == 443) { + if (ngx_js_https(&u)) { http->ssl = http->conf->ssl; http->ssl_verify = http->conf->ssl_verify; } @@ -1425,7 +1425,7 @@ ngx_js_request_constructor(njs_vm_t *vm, ngx_js_request_t *request, u->url.len = request->url.len; u->url.data = request->url.data; - u->default_port = 80; + u->default_port = NGX_JS_HTTP_DEFAULT_PORT; u->uri_part = 1; u->no_resolve = 1; @@ -1441,7 +1441,7 @@ ngx_js_request_constructor(njs_vm_t *vm, ngx_js_request_t *request, { u->url.len -= 8; u->url.data += 8; - u->default_port = 443; + u->default_port = NGX_JS_HTTPS_DEFAULT_PORT; #endif } else { diff --git a/nginx/ngx_js_http.h b/nginx/ngx_js_http.h index d2ac0a4c..d122f28c 100644 --- a/nginx/ngx_js_http.h +++ b/nginx/ngx_js_http.h @@ -12,6 +12,10 @@ #define NGX_JS_HOST_MAX_LEN 256 +#define NGX_JS_HTTP_DEFAULT_PORT 80 +#define NGX_JS_HTTPS_DEFAULT_PORT 443 + +#define ngx_js_https(u) ((u)->default_port == NGX_JS_HTTPS_DEFAULT_PORT) typedef struct ngx_js_http_s ngx_js_http_t; diff --git a/nginx/ngx_qjs_fetch.c b/nginx/ngx_qjs_fetch.c index 392bad11..447dfadd 100644 --- a/nginx/ngx_qjs_fetch.c +++ b/nginx/ngx_qjs_fetch.c @@ -280,7 +280,7 @@ ngx_qjs_ext_fetch(JSContext *cx, JSValueConst this_val, int argc, ngx_qjs_external_max_response_buffer_size(cx, external); #if (NGX_SSL) - if (u.default_port == 443) { + if (ngx_js_https(&u)) { http->ssl = ngx_qjs_external_ssl(cx, external); http->ssl_verify = ngx_qjs_external_ssl_verify(cx, external); } @@ -662,7 +662,7 @@ ngx_qjs_request_ctor(JSContext *cx, ngx_js_request_t *request, ngx_memzero(u, sizeof(ngx_url_t)); u->url = request->url; - u->default_port = 80; + u->default_port = NGX_JS_HTTP_DEFAULT_PORT; u->uri_part = 1; u->no_resolve = 1; @@ -678,7 +678,7 @@ ngx_qjs_request_ctor(JSContext *cx, ngx_js_request_t *request, { u->url.len -= 8; u->url.data += 8; - u->default_port = 443; + u->default_port = NGX_JS_HTTPS_DEFAULT_PORT; #endif } else { -- 2.47.3