diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-08-28 09:23:24 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-08-28 09:23:24 +0100 |
| commit | 878efeecd5030048b33121b05c6cf402f860ca1d (patch) | |
| tree | 29a8b368a2ebd36175100726d9d02b82b27edc8c /net | |
| parent | 6007de18c4db1acae2bb17c9d2aaad3b1ef994f5 (diff) | |
| parent | b27e7b3834519214f9b3c9e6e041421429bbcc74 (diff) | |
| download | prosody-878efeecd5030048b33121b05c6cf402f860ca1d.tar.gz prosody-878efeecd5030048b33121b05c6cf402f860ca1d.zip | |
Merge 0.9->0.10
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/server.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/server.lua b/net/http/server.lua index 510b77fb..09f8d2a4 100644 --- a/net/http/server.lua +++ b/net/http/server.lua @@ -98,7 +98,7 @@ function listener.onconnect(conn) 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); |