Software / code / prosody
Comparison
net/server_select.lua @ 7042:20ac6972b9aa
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 02 Jan 2016 20:42:53 +0000 |
| parent | 6820:40d50c239564 |
| parent | 7041:aff786e7b4ce |
| child | 7046:6b4232125f32 |
comparison
equal
deleted
inserted
replaced
| 7038:22f36a3d6369 | 7042:20ac6972b9aa |
|---|---|
| 932 end | 932 end |
| 933 end | 933 end |
| 934 end | 934 end |
| 935 until quitting; | 935 until quitting; |
| 936 if once and quitting == "once" then quitting = nil; return; end | 936 if once and quitting == "once" then quitting = nil; return; end |
| 937 closeall(); | |
| 937 return "quitting" | 938 return "quitting" |
| 938 end | 939 end |
| 939 | 940 |
| 940 local function step() | 941 local function step() |
| 941 return loop(true); | 942 return loop(true); |