Software / code / prosody
Diff
util/adminstream.lua @ 12415:01ba67e7f824
Merge 0.12->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 19 Mar 2022 09:28:59 +0000 |
| parent | 12393:6966026262f4 |
| child | 12852:c35afa353f8f |
line wrap: on
line diff
--- a/util/adminstream.lua Fri Mar 18 20:14:20 2022 +0000 +++ b/util/adminstream.lua Sat Mar 19 09:28:59 2022 +0000 @@ -139,6 +139,15 @@ local function new_connection(socket_path, listeners) local have_unix, unix = pcall(require, "socket.unix"); + if have_unix and type(unix) == "function" then + -- COMPAT #1717 + -- Before the introduction of datagram support, only the stream socket + -- constructor was exported instead of a module table. Due to the lack of a + -- proper release of LuaSocket, distros have settled on shipping either the + -- last RC tag or some commit since then. + -- Here we accomodate both variants. + unix = { stream = unix }; + end if type(unix) ~= "table" then have_unix = false; end
