Permalink
Browse files

Merge remote-tracking branch 'capflam/infinite_keepalive_timeout'

  • Loading branch information...
2 parents 9cde5d0 + 96da4a1 commit 9b220fedf84f728b71813ce35ee8fc5be65e626a @klacke committed Jan 9, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 src/yaws_config.erl
View
@@ -733,6 +733,9 @@ fload(FD, globals, GC, C, Cs, Lno, Chars) ->
I when is_integer(I) ->
fload(FD, globals, GC#gconf{keepalive_timeout = I},
C, Cs, Lno+1, Next);
+ _ when Val == "infinity" ->
+ fload(FD, globals, GC#gconf{keepalive_timeout = infinity},
+ C, Cs, Lno+1, Next);
_ ->
{error, ?F("Expect integer at line ~w", [Lno])}
end;

0 comments on commit 9b220fe

Please sign in to comment.