prosody
e239668aa6d2
net/server_select.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/server_select.lua @ 4797:e239668aa6d2

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 29 Apr 2012 02:10:55 +0100
parent 4675:80f2d952d4c5
child 4808:07d0a3a75c8a
comparison
equal deleted inserted replaced
4796:04a34287dc12 4797:e239668aa6d2
200 end 200 end
201 end 201 end
202 socket:close( ) 202 socket:close( )
203 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) 203 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
204 _readlistlen = removesocket( _readlist, socket, _readlistlen ) 204 _readlistlen = removesocket( _readlist, socket, _readlistlen )
205 _server[ip..":"..serverport] = nil;
205 _socketlist[ socket ] = nil 206 _socketlist[ socket ] = nil
206 handler = nil 207 handler = nil
207 socket = nil 208 socket = nil
208 --mem_free( ) 209 --mem_free( )
209 out_put "server.lua: closed server handler and removed sockets from list" 210 out_put "server.lua: closed server handler and removed sockets from list"
594 595
595 handler.readbuffer = handshake 596 handler.readbuffer = handshake
596 handler.sendbuffer = handshake 597 handler.sendbuffer = handshake
597 handshake( socket ) -- do handshake 598 handshake( socket ) -- do handshake
598 end 599 end
599 handler.readbuffer = _readbuffer 600 end
600 handler.sendbuffer = _sendbuffer 601
601 602 handler.readbuffer = _readbuffer
602 if sslctx then 603 handler.sendbuffer = _sendbuffer
603 out_put "server.lua: auto-starting ssl negotiation..."
604 handler.autostart_ssl = true;
605 handler:starttls(sslctx);
606 end
607
608 else
609 handler.readbuffer = _readbuffer
610 handler.sendbuffer = _sendbuffer
611 end
612 send = socket.send 604 send = socket.send
613 receive = socket.receive 605 receive = socket.receive
614 shutdown = ( ssl and id ) or socket.shutdown 606 shutdown = ( ssl and id ) or socket.shutdown
615 607
616 _socketlist[ socket ] = handler 608 _socketlist[ socket ] = handler
617 _readlistlen = addsocket(_readlist, socket, _readlistlen) 609 _readlistlen = addsocket(_readlist, socket, _readlistlen)
610
611 if sslctx and luasec then
612 out_put "server.lua: auto-starting ssl negotiation..."
613 handler.autostart_ssl = true;
614 handler:starttls(sslctx);
615 end
616
618 return handler, socket 617 return handler, socket
619 end 618 end
620 619
621 id = function( ) 620 id = function( )
622 end 621 end