Mercurial > prosody-hg

comparison net/server_event.lua @ 4541:05f5ec99da77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parents 938d878d8087
children 1ce2ff9ec313
comparison
equal deleted inserted replaced
4530:40905e7bf680 4541:05f5ec99da77
293 function interface_mt:pause() 293 function interface_mt:pause()
294 return self:_lock(self.nointerface, true, self.nowriting); 294 return self:_lock(self.nointerface, true, self.nowriting);
295 end 295 end
296 296
297 function interface_mt:resume() 297 function interface_mt:resume()
298 return self:_lock(self.nointerface, false, self.nowriting); 298 self:_lock(self.nointerface, false, self.nowriting);
299 if not self.eventread then
300 self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT ); -- register callback
301 end
299 end 302 end
300 303
301 function interface_mt:counter(c) 304 function interface_mt:counter(c)
302 if c then 305 if c then
303 self._connections = self._connections + c 306 self._connections = self._connections + c
640 interface:_close() 643 interface:_close()
641 interface.eventread = nil 644 interface.eventread = nil
642 return -1 645 return -1
643 end 646 end
644 end 647 end
648 if interface.noreading then
649 interface.eventread = nil;
650 return -1;
651 end
645 return EV_READ, cfg.READ_TIMEOUT 652 return EV_READ, cfg.READ_TIMEOUT
646 end 653 end
647 end 654 end
648 655
649 client:settimeout( 0 ) -- set non blocking 656 client:settimeout( 0 ) -- set non blocking