Mercurial > prosody-hg
comparison net/server.lua @ 319:4a8a949c3870
Fix for putting TLS in stream:features for connections already using TLS. Thanks to albert for spotting.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 16 Nov 2008 00:29:15 +0000 |
| parents | 93f3c6b94c75 |
| children | a1d25769970f |
comparison
equal
deleted
inserted
replaced
| 318:cc20ea4a8697 | 319:4a8a949c3870 |
|---|---|
| 520 return send( socket, data, i, j ) | 520 return send( socket, data, i, j ) |
| 521 end | 521 end |
| 522 handler.receive = function( pattern, prefix ) | 522 handler.receive = function( pattern, prefix ) |
| 523 return receive( socket, pattern, prefix ) | 523 return receive( socket, pattern, prefix ) |
| 524 end | 524 end |
| 525 | |
| 526 handler.starttls = nil; | |
| 525 | 527 |
| 526 handler.handshake = coroutine_wrap( function( client ) | 528 handler.handshake = coroutine_wrap( function( client ) |
| 527 local err | 529 local err |
| 528 for i = 1, 10 do -- 10 handshake attemps | 530 for i = 1, 10 do -- 10 handshake attemps |
| 529 _, err = client:dohandshake( ) | 531 _, err = client:dohandshake( ) |