diff options
author | Fredrik Gustafsson <[email protected]> | 2012-11-06 16:42:09 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2012-11-06 16:42:09 +0100 |
commit | 40d2dd2e50cf245ae88e0a10b3d2f50386264ca5 (patch) | |
tree | e28bfd11ad741b82c52827a7763d310771fba005 /lib | |
parent | 6291667b75dc66f57b1e00fed9aac356538b9ed9 (diff) | |
download | otp-40d2dd2e50cf245ae88e0a10b3d2f50386264ca5.tar.gz otp-40d2dd2e50cf245ae88e0a10b3d2f50386264ca5.tar.bz2 otp-40d2dd2e50cf245ae88e0a10b3d2f50386264ca5.zip |
Changed property to minimum_bytes_per_second and checking if is integer on start
Diffstat (limited to 'lib')
-rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 15 | ||||
-rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index b575d7331b..884e3defb8 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -483,7 +483,7 @@ validate_properties(Properties) -> case mandatory_properties(Properties) of ok -> %% Second, check that property dependency are ok - {ok, validate_properties2(Properties)}; + {ok, check_minimum_bytes_per_second(validate_properties2(Properties))}; Error -> throw(Error) end. @@ -522,7 +522,18 @@ validate_properties2(Properties) -> throw(Error) end end. - +check_minimum_bytes_per_second(Properties) -> + case proplists:get_value(minimum_bytes_per_second, Properties, false) of + false -> + Properties; + Nr -> + case is_integer(Nr) of + false -> + throw({error, {minimum_bytes_per_second, is_not_integer}}); + _ -> + Properties + end + end. mandatory_properties(ConfigList) -> a_must(ConfigList, [server_name, port, server_root, document_root]). diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 73ccd74917..0f9e82fd29 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -144,7 +144,7 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) -> ?hdrt("set socket options (binary, packet & active)", []), http_transport:setopts(SocketType, Socket, [binary, {packet, 0}, {active, once}]), - NewState = data_receive_counter(activate_request_timeout(State), httpd_util:lookup(ConfigDB, byte_limit, false)), + NewState = data_receive_counter(activate_request_timeout(State), httpd_util:lookup(ConfigDB, minimum_bytes_per_second, false)), ?hdrt("init done", []), gen_server:enter_loop(?MODULE, [], NewState). |