Merge zmq_ipc_uri_compat

luke-jr · luke-jr · commit 85f09aa4af0c · 2025-03-05T03:27:08.000Z
diff --git a/src/init.cpp b/src/init.cpp
@@ -1462,7 +1462,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
             if (!SplitHostPort(socket_addr, port_out, host_out)) {
 #ifdef HAVE_SOCKADDR_UN
                 // Allow unix domain sockets for some options e.g. unix:/some/file/path
-                if (!unix || socket_addr.find(ADDR_PREFIX_UNIX) != 0) {
+                if (!unix || (socket_addr.find(ADDR_PREFIX_UNIX) != 0 && socket_addr.rfind("ipc:", 0) != 0)) {
                     return InitError(InvalidPortErrMsg(arg, socket_addr));
                 }
 #else

Original file line number	Diff line number	Diff line change
`@@ -1462,7 +1462,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)`
`1462`	`1462`	`if (!SplitHostPort(socket_addr, port_out, host_out)) {`
`1463`	`1463`	`#ifdef HAVE_SOCKADDR_UN`
`1464`	`1464`	`// Allow unix domain sockets for some options e.g. unix:/some/file/path`
`1465`		`- if (!unix \|\| socket_addr.find(ADDR_PREFIX_UNIX) != 0) {`
	`1465`	`+ if (!unix \|\| (socket_addr.find(ADDR_PREFIX_UNIX) != 0 && socket_addr.rfind("ipc:", 0) != 0)) {`
`1466`	`1466`	`return InitError(InvalidPortErrMsg(arg, socket_addr));`
`1467`	`1467`	`}`
`1468`	`1468`	`#else`