aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-10-12 16:24:49 +0200
committerKim Alvefur <zash@zash.se>2018-10-12 16:24:49 +0200
commit2104ac9fb01d6b1ee06eb72dbc7b3ccb28f3630c (patch)
tree0521e9e97def91859469fc9b4a049e46f5accd87
parent284152ba25ca74ff62690314b5aa6ffaee17b4fc (diff)
downloadprosody-2104ac9fb01d6b1ee06eb72dbc7b3ccb28f3630c.tar.gz
prosody-2104ac9fb01d6b1ee06eb72dbc7b3ccb28f3630c.zip
net.server: Remove socket constructor fallback
Should no longer be needed
-rw-r--r--net/server_event.lua2
-rw-r--r--net/server_select.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 5a4dc1a4..ff3f921b 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -737,7 +737,7 @@ local function addclient( addr, serverport, listener, pattern, sslctx, typ )
typ = "tcp4";
end
end
- local create = socket[typ] or socket.tcp;
+ local create = socket[typ];
if type( create ) ~= "function" then
return nil, "invalid socket type"
end
diff --git a/net/server_select.lua b/net/server_select.lua
index c5f9004c..50e439b1 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -1017,7 +1017,7 @@ local addclient = function( address, port, listeners, pattern, sslctx, typ )
typ = "tcp4";
end
end
- local create = luasocket[typ] or luasocket.tcp;
+ local create = luasocket[typ];
if type( create ) ~= "function" then
err = "invalid socket type"
end