# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1396360956 -3600
# Node ID e447601cf13ce99db8edbf4a0ad4ee39c6d628d0
# Parent  1ce05d38d1bb20749cf8ae2c67210857e778f64e# Parent  4db0403bfc0df9c805b45ef7256e63305524db05
Merge

diff -r 1ce05d38d1bb -r e447601cf13c net/server_event.lua
--- a/net/server_event.lua	Sun Mar 30 09:16:27 2014 +0100
+++ b/net/server_event.lua	Tue Apr 01 15:02:36 2014 +0100
@@ -367,6 +367,7 @@
 	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 -r 1ce05d38d1bb -r e447601cf13c net/server_select.lua
--- a/net/server_select.lua	Sun Mar 30 09:16:27 2014 +0100
+++ b/net/server_select.lua	Tue Apr 01 15:02:36 2014 +0100
@@ -397,6 +397,7 @@
 	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