Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge with 0.5
Sun, 12 Jul 2009 20:33:09 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Sun, 12 Jul 2009 20:33:09 +0100
- changeset 1545
- e6bd29342f65
- parent 1542
- e5d5f864c125 (current diff)
- parent 1544
- c7f0938bc33e (diff)
- child 1547
- 30c548e1d517
Merge with 0.5
--- a/net/server.lua Sun Jul 12 19:17:14 2009 +0100 +++ b/net/server.lua Sun Jul 12 20:33:09 2009 +0100 @@ -1,19 +1,9 @@ --- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain --- --- This project is MIT/X11 licensed. Please see the --- COPYING file in the source package for more information. --- - ---[[ - - server.lua by blastbeat - - - this script contains the server loop of the program - - other scripts can reg a server here - -]]-- +-- +-- server.lua by blastbeat of the luadch project +-- Re-used here under the MIT/X Consortium License +-- +-- Modifications (C) 2008-2009 Matthew Wild, Waqas Hussain +-- -- // wrapping luadch stuff // -- @@ -546,7 +536,7 @@ socket:settimeout( 0 ) handler.readbuffer = handshake handler.sendbuffer = handshake - if not handshake( socket ) then -- do handshake + if not socket then -- do handshake return nil, nil, "ssl handshake failed"; end else
