diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-31 15:34:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-02-18 18:02:59 +0100 |
| commit | baca1b6cf223b03786ea47fc101f4249bda3cb3c (patch) | |
| tree | d5c733444f16e34188f7bc3d9bedf24c35ef63d5 /lib/inets/src/http_server/httpd_conf.erl | |
| parent | 79f4745f6e7254a5399c63f9947dc39c1abd21ba (diff) | |
| download | otp-baca1b6cf223b03786ea47fc101f4249bda3cb3c.tar.gz otp-baca1b6cf223b03786ea47fc101f4249bda3cb3c.tar.bz2 otp-baca1b6cf223b03786ea47fc101f4249bda3cb3c.zip | |
inets: Improve ssl handling
httpc: CTfy test suite
httpd: Simplify ssl configuration OTP-10846
Diffstat (limited to 'lib/inets/src/http_server/httpd_conf.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index a97bbd9b25..d45f3c0048 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2012. All Rights Reserved. +%% Copyright Ericsson AB 1997-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -582,11 +582,17 @@ validate_config_params([{server_tokens, {private, Value}} | Rest]) validate_config_params([{server_tokens, Value} | _]) -> throw({server_tokens, Value}); +validate_config_params([{socket_type, ip_comm} | Rest]) -> + validate_config_params(Rest); + validate_config_params([{socket_type, Value} | Rest]) - when (Value =:= ip_comm) orelse - (Value =:= ssl) orelse - (Value =:= essl) -> + when Value == ssl; Value == essl -> validate_config_params(Rest); + +validate_config_params([{socket_type, {Value, _}} | Rest]) + when Value == essl orelse Value == ssl -> + validate_config_params(Rest); + validate_config_params([{socket_type, Value} | _]) -> throw({socket_type, Value}); @@ -916,6 +922,8 @@ lookup_socket_type(ConfigDB) -> case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of ip_comm -> ip_comm; + {Tag, Conf} -> + {Tag, Conf}; SSL when (SSL =:= ssl) orelse (SSL =:= essl) -> SSLTag = if |