diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-08-28 12:05:18 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-08-28 12:05:18 +0100 |
| commit | 656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3 (patch) | |
| tree | f9b41c73e3cda1b1f3ffe63a3921967eea4a20d6 /net | |
| parent | bf66f0049f2e7682ed6354388db92a2b25ea67b6 (diff) | |
| parent | 878efeecd5030048b33121b05c6cf402f860ca1d (diff) | |
| download | prosody-656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3.tar.gz prosody-656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3.zip | |
Merge 0.10->trunk
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); |