Merge remote-tracking branch 'capflam/infinite_keepalive_timeout'

erlyaws · Jan 9, 2012 · 9b220fe · 9b220fe
2 parents 9cde5d0 + 96da4a1
commit 9b220fe
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/yaws_config.erl b/src/yaws_config.erl
@@ -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;