diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
| commit | 499cb87234e01044440591b90c8eb46e63d1e01a (patch) | |
| tree | 861eaefae2bd906eace48b17e5f6172dca6c8f5c /net | |
| parent | c98c0fb432db6ce9c7bbcd433168aa27b36854b8 (diff) | |
| parent | 27b4049481f29dcac2d6093c40ad7e8bf1ea8899 (diff) | |
| download | prosody-499cb87234e01044440591b90c8eb46e63d1e01a.tar.gz prosody-499cb87234e01044440591b90c8eb46e63d1e01a.zip | |
Merge 0.10->trunk
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 ef0a27d8..a3087847 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -368,6 +368,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 b69b5fc7..4a36617c 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -402,6 +402,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 |