prosody
3ff83773ffc0
net/server_select.lua
Software / code / prosody
Comparison
net/server_select.lua @ 7074:3ff83773ffc0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Jan 2016 03:57:17 +0100 |
| parent | 7046:6b4232125f32 |
| parent | 7066:7d5a1fb9bf9e |
| child | 7099:8e64e7b82928 |
comparison
equal
deleted
inserted
replaced
| 7063:bc1b375f379e | 7074:3ff83773ffc0 |
|---|---|
| 388 if server then | 388 if server then |
| 389 server.remove( ) | 389 server.remove( ) |
| 390 end | 390 end |
| 391 out_put "server.lua: closed client handler and removed socket from list" | 391 out_put "server.lua: closed client handler and removed socket from list" |
| 392 return true | 392 return true |
| 393 end | |
| 394 handler.server = function ( ) | |
| 395 return server | |
| 393 end | 396 end |
| 394 handler.ip = function( ) | 397 handler.ip = function( ) |
| 395 return ip | 398 return ip |
| 396 end | 399 end |
| 397 handler.serverport = function( ) | 400 handler.serverport = function( ) |
