lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Cloud Wu
2014-08-25 10:16:06 +08:00
parent 16f63df0c3 9bb8099008
commit bfb8bcb86e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY.md
View File

@@ -1,3 +1,9 @@
v0.6.1 (2014-8-25)
-----------
* bugfix: datacenter.wakeup
* change struct msg name to avoid conflict in mac
* improve seri library
v0.6.0 (2014-8-18) v0.6.0 (2014-8-18)
----------- -----------
* add sharedata * add sharedata

2
lualib/socket.lua
View File

@@ -145,6 +145,8 @@ local function connect(id, func)
suspend(s) suspend(s)
if s.connected then if s.connected then
return id return id
else
socket_pool[id] = nil
end end
end end