From: Thomas Harning Jr <harningt@gmail.com>
Date: Wed, 11 Apr 2012 02:42:57 +0000 (-0400)
Subject: lua: fixes merge bug with client vs sock argument naming
X-Git-Tag: v0.4.0~4
X-Git-Url: https://repo.or.cz/w/luaevent.git/commitdiff_plain/73175dd1d9900ba169fd934284bcda217ee02729

lua: fixes merge bug with client vs sock argument naming
---

diff --git a/CHANGELOG b/CHANGELOG
index c295d76..3300516 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+0.4.0 - WIP
+ * Fixes bug in merge for receivePartial
 0.3.2 - 2011-07-06
  * Fixed recorded version in Lua
 0.3.1 - 2011-01-15
diff --git a/lua/luaevent.lua b/lua/luaevent.lua
index 509d94f..2947ce9 100644
--- a/lua/luaevent.lua
+++ b/lua/luaevent.lua
@@ -1,5 +1,5 @@
 --[[
-	LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
+	LuaEvent - Copyright (C) 2007,2012 Thomas Harning <harningt@gmail.com>
 	Licensed as LGPL - See doc/COPYING for details.
 ]]
 module("luaevent", package.seeall)
@@ -59,7 +59,7 @@ function receivePartial(client, pattern)
 	s, err, part = client:receive(pattern)
 	if s or ( (type(pattern)=="number") and part~="" and part ~=nil ) or 
 		err ~= "timeout" then return s, err, part end
-		socketWait(sock, EV_READ)
+		socketWait(client, EV_READ)
 	until false
 end
 function connect(sock, ...)