# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1684935328 -7200
# Node ID 8576f94ac90a32d98e760bd39eec29f0e111a9a8
# Parent  5469045ef7f0a59b8520a48c6481a94eeffb27c2# Parent  d5f322dd424b497ed6f0e1cfa729524377fba780
Merge 0.12->trunk

diff -r 5469045ef7f0 -r 8576f94ac90a core/features.lua
--- a/core/features.lua	Wed May 24 14:56:50 2023 +0200
+++ b/core/features.lua	Wed May 24 15:35:28 2023 +0200
@@ -10,5 +10,7 @@
 		"loader";
 		-- "keyval+" store
 		"keyval+";
+
+		"s2sout-pre-connect-event";
 	};
 };
diff -r 5469045ef7f0 -r 8576f94ac90a plugins/mod_s2s.lua
--- a/plugins/mod_s2s.lua	Wed May 24 14:56:50 2023 +0200
+++ b/plugins/mod_s2s.lua	Wed May 24 15:35:28 2023 +0200
@@ -226,6 +226,10 @@
 			resolver;
 		});
 	end
+
+	local pre_event = { session = host_session; resolver = resolver };
+	module:context(from_host):fire_event("s2sout-pre-connect", pre_event);
+	resolver = pre_event.resolver;
 	connect(resolver, listener, nil, { session = host_session });
 	m_initiated_connections:with_labels(from_host):add(1)
 	return true;