Fetch: simplified ngx_js_http_resolve().

diff --git a/nginx/ngx_js_fetch.c b/nginx/ngx_js_fetch.c
index ac1c1a27bb7cc53feb2957c8259722a5b1c1dc0b..6a785df1494c812e21184c92bff3e3ccbceb77c2 100644 (file)
--- a/nginx/ngx_js_fetch.c
+++ b/nginx/ngx_js_fetch.c
@@ -723,7 +723,7 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     if (u.addrs == NULL) {
         ctx = ngx_js_http_resolve(http, ngx_external_resolver(vm, external),
-                                  &u.host, u.port,
+                                  &u.host,
                                   ngx_external_resolver_timeout(vm, external));
         if (ctx == NULL) {
             njs_vm_memory_error(vm);

diff --git a/nginx/ngx_js_http.c b/nginx/ngx_js_http.c
index 35c67842fd239749db0b1550aea49fac5390268c..259f681dd624d683294ff9f781cee4f87901af62 100644 (file)
--- a/nginx/ngx_js_http.c
+++ b/nginx/ngx_js_http.c
@@ -75,7 +75,7 @@ ngx_js_http_error(ngx_js_http_t *http, const char *fmt, ...)
 
 ngx_resolver_ctx_t *
 ngx_js_http_resolve(ngx_js_http_t *http, ngx_resolver_t *r, ngx_str_t *host,
-    in_port_t port, ngx_msec_t timeout)
+    ngx_msec_t timeout)
 {
     ngx_int_t            ret;
     ngx_resolver_ctx_t  *ctx;
@@ -90,7 +90,6 @@ ngx_js_http_resolve(ngx_js_http_t *http, ngx_resolver_t *r, ngx_str_t *host,
     }
 
     http->ctx = ctx;
-    http->port = port;
 
     ctx->name = *host;
     ctx->handler = ngx_js_http_resolve_handler;

diff --git a/nginx/ngx_js_http.h b/nginx/ngx_js_http.h
index acaa5802788664ac303b73faf9886241414e56f2..d2ac0a4c45dc9e1e40f1c75c1b9f3bcc3e41cad8 100644 (file)
--- a/nginx/ngx_js_http.h
+++ b/nginx/ngx_js_http.h
@@ -155,7 +155,7 @@ struct ngx_js_http_s {
 
 
 ngx_resolver_ctx_t *ngx_js_http_resolve(ngx_js_http_t *http, ngx_resolver_t *r,
-    ngx_str_t *host, in_port_t port, ngx_msec_t timeout);
+    ngx_str_t *host, ngx_msec_t timeout);
 void ngx_js_http_connect(ngx_js_http_t *http);
 void ngx_js_http_resolve_done(ngx_js_http_t *http);
 void ngx_js_http_close_peer(ngx_js_http_t *http);

diff --git a/nginx/ngx_qjs_fetch.c b/nginx/ngx_qjs_fetch.c
index a211e0fef9b4505aca91ee47aeb3daa1ad92131d..392bad117455a60f243143369d6ebcbc3db2ae67 100644 (file)
--- a/nginx/ngx_qjs_fetch.c
+++ b/nginx/ngx_qjs_fetch.c
@@ -460,7 +460,7 @@ ngx_qjs_ext_fetch(JSContext *cx, JSValueConst this_val, int argc,
 
     if (u.addrs == NULL) {
         rs = ngx_js_http_resolve(http, ngx_qjs_external_resolver(cx, external),
-                                 &u.host, u.port,
+                                 &u.host,
                                ngx_qjs_external_resolver_timeout(cx, external));
         if (rs == NULL) {
             JS_FreeValue(cx, promise);