diff options
| author | Raimo Niskanen <[email protected]> | 2016-08-02 09:31:24 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-08-02 09:31:24 +0200 |
| commit | 0bc1bed3f6e487ebfbf8b6c45e7218fe816e7b8f (patch) | |
| tree | 1327f03d8546892f0e931645a15daecdf29e2959 /lib/inets/src | |
| parent | 6dcf9c56c648bb6fa2f0e27bdf6429eab23fdd8c (diff) | |
| parent | 0c910241fdf66b5b0165e9a45c21ce38e83f8b28 (diff) | |
| download | otp-0bc1bed3f6e487ebfbf8b6c45e7218fe816e7b8f.tar.gz otp-0bc1bed3f6e487ebfbf8b6c45e7218fe816e7b8f.tar.bz2 otp-0bc1bed3f6e487ebfbf8b6c45e7218fe816e7b8f.zip | |
Merge branch 'efine/inets/validate-inet6fb4/ERL-200/PR-1132/OTP-13776' into maint
* efine/inets/validate-inet6fb4/ERL-200/PR-1132/OTP-13776:
Test inet6fb4 in basic suite
Actually verify result of testcase
Fix inets_sup_SUITE for local tests
Add test for inet6fb4 validation
Fix httpd_conf:validate_properties/1 for ipfamily
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index e5182ca23c..9e54f2b2c5 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -395,7 +395,8 @@ validate_properties(Properties) -> %% That is, if property A depends on property B. %% The only sunch preperty at this time is bind_address that depends %% on ipfamily. -validate_properties2(Properties) -> +validate_properties2(Properties0) -> + Properties = fix_ipfamily(Properties0), case proplists:get_value(bind_address, Properties) of undefined -> case proplists:get_value(sock_type, Properties, ip_comm) of @@ -422,6 +423,15 @@ validate_properties2(Properties) -> end end. +fix_ipfamily(Properties) -> + case proplists:get_value(ipfamily, Properties) of + undefined -> + Properties; + IpFamily -> + NewProps = proplists:delete(ipfamily, Properties), + [{ipfamily, validate_ipfamily(IpFamily)} | NewProps] + end. + add_inet_defaults(Properties) -> case proplists:get_value(ipfamily, Properties) of undefined -> |