# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1267466932 0
# Node ID dea5a65b321d6c01d498bab8407fba1375a43688
# Parent  aab12281488fe8db29ea6f2c95a21be614c7b90a# Parent  7e0c35713bf5d91579567092dca20843d4fb5df6
Merge with 0.7

diff -r aab12281488f -r dea5a65b321d net/server_select.lua
--- a/net/server_select.lua	Mon Mar 01 16:45:49 2010 +0000
+++ b/net/server_select.lua	Mon Mar 01 18:08:52 2010 +0000
@@ -435,7 +435,7 @@
 			local len = string_len( buffer )
 			if len > maxreadlen then
 				disconnect( handler, "receive buffer exceeded" )
-				handler.close( true )
+				handler:close( true )
 				return false
 			end
 			local count = len * STAT_UNIT
@@ -448,7 +448,7 @@
 			out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " read error: ", tostring(err) )
 			fatalerror = true
 			disconnect( handler, err )
-		_ = handler and handler.close( )
+		_ = handler and handler:close( )
 			return false
 		end
 	end
@@ -472,7 +472,7 @@
 			_sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist
 			_ = needtls and handler:starttls(nil, true)
 			_writetimes[ handler ] = nil
-			_ = toclose and handler.close( )
+			_ = toclose and handlerclose( )
 			return true
 		elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
 			buffer = string_sub( buffer, byte + 1, bufferlen ) -- new buffer
@@ -485,7 +485,7 @@
 			out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " write error: ", tostring(err) )
 			fatalerror = true
 			disconnect( handler, err )
-			_ = handler and handler.close( )
+			_ = handler and handler:close( )
 			return false
 		end
 	end
diff -r aab12281488f -r dea5a65b321d plugins/mod_proxy65.lua
--- a/plugins/mod_proxy65.lua	Mon Mar 01 16:45:49 2010 +0000
+++ b/plugins/mod_proxy65.lua	Mon Mar 01 18:08:52 2010 +0000
@@ -91,12 +91,12 @@
 			conn:lock_read(true)
 		else
 			module:log("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
-			conn.close();
+			conn:close();
 		end
 	else
 		if data ~= nil then
 			module:log("warn", "unknown connection with no authentication data -> closing it");
-			conn.close();
+			conn:close();
 		end
 	end
 end
@@ -107,9 +107,9 @@
 		if session.sha and transfers[session.sha] then
 			local initiator, target = transfers[session.sha].initiator, transfers[session.sha].target;
 			if initiator == conn and target ~= nil then
-				target.close();
+				target:close();
 			elseif target == conn and initiator ~= nil then
-			 	initiator.close();
+			 	initiator:close();
 			end
 			transfers[session.sha] = nil;
 		end