Mercurial > prosody-hg
comparison net/server_select.lua @ 7046:6b4232125f32
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 04 Jan 2016 09:09:15 +0000 |
| parents | 20ac6972b9aa 14bc5593b97e |
| children | 3ff83773ffc0 |
comparison
equal
deleted
inserted
replaced
| 7042:20ac6972b9aa | 7046:6b4232125f32 |
|---|---|
| 578 end | 578 end |
| 579 err = nil; | 579 err = nil; |
| 580 coroutine_yield( ) -- handshake not finished | 580 coroutine_yield( ) -- handshake not finished |
| 581 end | 581 end |
| 582 end | 582 end |
| 583 out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") ) | 583 err = "ssl handshake error: " .. ( err or "handshake too long" ); |
| 584 _ = handler and handler:force_close("ssl handshake failed") | 584 out_put( "server.lua: ", err ); |
| 585 _ = handler and handler:force_close(err) | |
| 585 return false, err -- handshake failed | 586 return false, err -- handshake failed |
| 586 end | 587 end |
| 587 ) | 588 ) |
| 588 end | 589 end |
| 589 if has_luasec then | 590 if has_luasec then |