From 5b3121c415ec96535eae4ed2adc28461311b6c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 27 Sep 2023 12:19:18 +0200
Subject: [PATCH] fix(core): Make DNS resolution order configurable (#7272)

---
 packages/cli/bin/n8n                      | 5 ++++-
 packages/cli/src/WorkflowRunnerProcess.ts | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/cli/bin/n8n b/packages/cli/bin/n8n
index 11c39af9b00cf..11e8b772ad41d 100755
--- a/packages/cli/bin/n8n
+++ b/packages/cli/bin/n8n
@@ -39,7 +39,10 @@ inspect.defaultOptions.customInspect = false;
 require('express-async-errors');
 require('source-map-support').install();
 require('reflect-metadata');
-require('dns').setDefaultResultOrder('ipv4first');
+
+if (process.env.NODEJS_PREFER_IPV4 === 'true') {
+	require('dns').setDefaultResultOrder('ipv4first');
+}
 
 require('@oclif/command')
 	.run()
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 4266f0facf6fe..071d8c982b179 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -7,7 +7,6 @@
 import 'source-map-support/register';
 import 'reflect-metadata';
 import { setDefaultResultOrder } from 'dns';
-setDefaultResultOrder('ipv4first');
 
 import { Container } from 'typedi';
 import type { IProcessMessage } from 'n8n-core';
@@ -59,6 +58,10 @@ import { License } from '@/License';
 import { InternalHooks } from '@/InternalHooks';
 import { PostHogClient } from '@/posthog';
 
+if (process.env.NODEJS_PREFER_IPV4 === 'true') {
+	setDefaultResultOrder('ipv4first');
+}
+
 class WorkflowRunnerProcess {
 	data: IWorkflowExecutionDataProcessWithExecution | undefined;