Mercurial > prosody-hg
diff net/http/server.lua @ 6367:769a3577dd85
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 09:23:24 +0100 |
| parents | d0e824a21861 ffcd3992a40c |
| children | 57d23c26039b |
line wrap: on
line diff
--- a/net/http/server.lua Wed Aug 27 13:00:04 2014 +0200 +++ b/net/http/server.lua Thu Aug 28 09:23:24 2014 +0100 @@ -98,7 +98,7 @@ local pending = {}; local waiting = false; local function process_next() - if waiting then log("debug", "can't process_next, waiting"); return; end + if waiting then return; end -- log("debug", "can't process_next, waiting"); waiting = true; while sessions[conn] and #pending > 0 do local request = t_remove(pending);