diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-01 15:02:36 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-01 15:02:36 +0100 |
| commit | 8001a6bbf7783411a73114113d57d284d64fbfd4 (patch) | |
| tree | 5922ad0f54f6bacd39cea376012e8ac27eaf58e1 /net | |
| parent | c5c028ec321103ade81fe008e9552fa22cfa071c (diff) | |
| parent | 8cf56e87aca20c4b09b56c0887464871d6eeab75 (diff) | |
| download | prosody-8001a6bbf7783411a73114113d57d284d64fbfd4.tar.gz prosody-8001a6bbf7783411a73114113d57d284d64fbfd4.zip | |
Merge
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_event.lua | 1 | ||||
| -rw-r--r-- | net/server_select.lua | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index e320b15c..25799640 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -367,6 +367,7 @@ do function interface_mt:ssl() return self._usingssl end + interface_mt.clientport = interface_mt.port -- COMPAT server_select function interface_mt:type() return self._type or "client" diff --git a/net/server_select.lua b/net/server_select.lua index 22887265..4bda3ef0 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -397,6 +397,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport handler.clientport = function( ) return clientport end + handler.port = handler.clientport -- COMPAT server_event local write = function( self, data ) bufferlen = bufferlen + #data if bufferlen > maxsendlen then |