Merge branch 'master' into dev

This commit is contained in:
Cloud Wu
2014-05-14 11:55:53 +08:00

View File

@@ -85,7 +85,7 @@ function MSG.data(fd, msg, sz)
if agent then if agent then
skynet.redirect(agent, c.client, "client", 0, msg, sz) skynet.redirect(agent, c.client, "client", 0, msg, sz)
else else
skynet.send(watchdog, "lua", "socket", "data", netpack.tostring(msg, sz)) skynet.send(watchdog, "lua", "socket", "data", fd, netpack.tostring(msg, sz))
end end
end end