Skip to content
Permalink
Browse files
Merge branch 'master' into rebarify-15688
  • Loading branch information
etrepum committed Nov 12, 2010
2 parents cfbcb9b + 80571b9 commit 54f9df6d817cd5950ef5ef0a14aec153f0dd9ab2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
@@ -1,7 +1,7 @@
%% This is generated from src/mochiweb.app.src
{application, mochiweb,
[{description, "MochiMedia Web Server"},
{vsn, "1.4.0"},
{vsn, "1.4.1"},
{modules, []},
{registered, []},
{mod, {mochiweb_app, []}},
@@ -40,8 +40,8 @@
%% @type response(). A mochiweb_response parameterized module instance.
%% @type ioheaders() = headers() | [{key(), value()}].

% 10 second default idle timeout
-define(IDLE_TIMEOUT, 10000).
% 5 minute default idle timeout
-define(IDLE_TIMEOUT, 300000).

% Maximum recv_body() length of 1MB
-define(MAX_RECV_BODY, (1024*1024)).
@@ -620,7 +620,7 @@ cmd_port_test_spool(Port, Acc) ->
cmd_port_test_spool(Port, ["\n", Data | Acc]);
{Port, Unknown} ->
throw({unknown, Unknown})
after 100 ->
after 1000 ->
throw(timeout)
end.

0 comments on commit 54f9df6

Please sign in to comment.