diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-01-22 22:55:49 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-01-22 22:55:49 +0000 |
| commit | 4d7ce5ef98953b67c80cc7f2fc347f01ad9cdd4e (patch) | |
| tree | acc1b9c5576f0ba21b56fd5b133a4a173798d042 /net/server_event.lua | |
| parent | b803655fc3922d51ccfb44eebe8540e3ba562b2b (diff) | |
| parent | 075f0cbd7c732c108e03ec8596e9934db7b8b06a (diff) | |
| download | prosody-4d7ce5ef98953b67c80cc7f2fc347f01ad9cdd4e.tar.gz prosody-4d7ce5ef98953b67c80cc7f2fc347f01ad9cdd4e.zip | |
Merge with trunk
Diffstat (limited to 'net/server_event.lua')
| -rw-r--r-- | net/server_event.lua | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index f4745c34..dbf5161f 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -295,7 +295,10 @@ do 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 @@ do return -1 end end + if interface.noreading then + interface.eventread = nil; + return -1; + end return EV_READ, cfg.READ_TIMEOUT end end |