prosody
c55e06eb53b2
net/server.lua
Software / code / prosody
Comparison
net/server.lua @ 1806:c55e06eb53b2
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Sep 2009 14:42:29 +0100 |
| parent | 1788:45779d67c26c |
| parent | 1804:f0f5ff6f82d6 |
| child | 1865:388b125b784a |
comparison
equal
deleted
inserted
replaced
| 1803:7fef8649d0f6 | 1806:c55e06eb53b2 |
|---|---|
| 361 end | 361 end |
| 362 else | 362 else |
| 363 send( socket, table_concat( bufferqueue, "", 1, bufferqueuelen ), 1, bufferlen ) -- forced send | 363 send( socket, table_concat( bufferqueue, "", 1, bufferqueuelen ), 1, bufferlen ) -- forced send |
| 364 end | 364 end |
| 365 end | 365 end |
| 366 if not handler then return true; end | |
| 366 _ = shutdown and shutdown( socket ) | 367 _ = shutdown and shutdown( socket ) |
| 367 socket:close( ) | 368 socket:close( ) |
| 368 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) | 369 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) |
| 369 _socketlist[ socket ] = nil | 370 _socketlist[ socket ] = nil |
| 370 if handler then | 371 if handler then |
