Mercurial > prosody-hg
diff net/server_event.lua @ 4541:05f5ec99da77
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | 938d878d8087 |
| children | 1ce2ff9ec313 |
line wrap: on
line diff
--- a/net/server_event.lua Sat Dec 10 17:21:19 2011 +0000 +++ b/net/server_event.lua Sun Jan 22 22:55:49 2012 +0000 @@ -295,7 +295,10 @@ end function interface_mt:resume() - return self:_lock(self.nointerface, false, self.nowriting); + self:_lock(self.nointerface, false, self.nowriting); + if not self.eventread then + self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT ); -- register callback + end end function interface_mt:counter(c) @@ -642,6 +645,10 @@ return -1 end end + if interface.noreading then + interface.eventread = nil; + return -1; + end return EV_READ, cfg.READ_TIMEOUT end end
