minor change

Merge branch 'v4.0.0' of https://github.com/rayaman/net into v4.0.0
tset
2019-06-16 22:15:54 -04:00 · 2019-03-22 21:17:24 -04:00 · 2019-03-22 21:17:21 -04:00 · 2019-02-05 15:59:37 -05:00 · 2019-02-04 21:12:23 -05:00
3 changed files with 2 additions and 4 deletions
--- a/net/init.lua
+++ b/net/init.lua
@ -469,9 +469,6 @@ function net:newUDPClient(host,port,servercode,nonluaServer)
 	net.OnClientCreated:Fire(c)
 	return c
 end
 multi:newThread(function()
 end)
 --TCP Stuff
 function net:newTCPClientObject(fd)
 	local c = {}
@ -824,7 +821,7 @@ function net:newTCPClient(host,port)
 			len = bin.new(dat):getBlock("n",self.numspace)
 			data, err = self.tcp:receive(len)
 		else
-			data,err = self.tcp:receive()
+			data, err = self.tcp:receive()
 		end
 		if err=="closed" then
 			self.OnClientDisconnected:Fire(self,err)
--- a/rockspec/lnet-4.0-0.rockspec
+++ b/rockspec/lnet-4.0-0.rockspec
@ -14,6 +14,7 @@ description = {
 }
 dependencies = {
   "lua >= 5.1",
   "luasocket",
   "multi"
 }
 build = {
--- a/test2.mp3
+++ b/test2.mp3
Author	SHA1	Message	Date
Ryan Ward	6d99893bda	minor change	2019-06-16 22:15:54 -04:00
Ryan Ward	111ca2ae06	Merge branch 'v4.0.0' of https://github.com/rayaman/net into v4.0.0	2019-03-22 21:17:24 -04:00
Ryan Ward	44e17d2e75	tset	2019-03-22 21:17:21 -04:00
Ryan Ward	dbe70c7d26	fix	2019-02-05 15:59:37 -05:00
Ryan Ward	c3d1a0e4b5	roxkspec update Why would it not requite luasocket	2019-02-04 21:12:23 -05:00