Fetch: introduced port and protocol helper macros.

diff --git a/nginx/ngx_js_fetch.c b/nginx/ngx_js_fetch.c
index 6a785df1494c812e21184c92bff3e3ccbceb77c2..b652ef27757ddf96489fe7a6b6647b4b6bad0691 100644 (file)
--- 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 d2ac0a4c45dc9e1e40f1c75c1b9f3bcc3e41cad8..d122f28c3d61cc1b789c3cc49eb320c116c0f5de 100644 (file)
--- 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 392bad117455a60f243143369d6ebcbc3db2ae67..447dfadd8f75b8a5d4942b7295e6ca618bce35d1 100644 (file)
--- 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 {