diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-02-14 20:47:09 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-02-14 20:47:09 +0000 |
| commit | 673df8d1d25a66903a9a2b2fdd96bac8aad09485 (patch) | |
| tree | a82b713b5ef5ef7c4cacc3ea36e009a24b110bf3 | |
| parent | c4b8c996167b9841f90224c4d60ea402ceb622e8 (diff) | |
| download | prosody-673df8d1d25a66903a9a2b2fdd96bac8aad09485.tar.gz prosody-673df8d1d25a66903a9a2b2fdd96bac8aad09485.zip | |
net.server_event: Fire onincoming() callback for new connections as opposed to the new onconnect() - let's change this for a future version though
| -rw-r--r-- | net/server_event.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 978341ad..8243a8a1 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -161,7 +161,7 @@ do self:_lock( false, false, false ) --vdebug( "start listening on client socket with id:", self.id ) self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT ) -- register callback - self:onconnect() + self:onincoming() self.eventsession = nil return -1 end @@ -677,6 +677,7 @@ do clientinterface:_start_session( clientinterface.onconnect ) end debug( "accepted incoming client connection from:", ip, port ) + client, err = server:accept() -- try to accept again end return EV_READ |