File 1072-Fix-httpd_conf-validate_properties-1-for-i... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1072-Fix-httpd_conf-validate_properties-1-for-ipfamily.patch of Package erlang (Revision c589bc075ed79a918315277f2ca40bc8)

Currently displaying revision c589bc075ed79a918315277f2ca40bc8 , Show latest

From 7babe1a82adc9dd1deb1b43074ac184f89fda945 Mon Sep 17 00:00:00 2001
From: Edwin Fine <efine@silentcircle.com>
Date: Fri, 22 Jul 2016 20:15:54 -0400
Subject: [PATCH 1/5] Fix httpd_conf:validate_properties/1 for ipfamily

inets:start/2 fails when using the legacy option inet6fb4 with a
configuration proplist. It is not translated to inet as documented.
This breaks existing code that relies on the documented behavior.

This commit fixes the issue by translating inet6fb4 everywhere it is
encountered in httpd_conf:validate_properties/1.

From inets documentation (http://erlang.org/doc/man/httpd.html):

{ipfamily, inet | inet6}
        Default is inet, legacy option inet6fb4 no longer makes sense
        and will be translated to inet.

Fixes ERL-200.
---
 lib/inets/src/http_server/httpd_conf.erl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index e5182ca..9e54f2b 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 ->
-- 
2.9.2

Places

File 1072-Fix-httpd_conf-validate_properties-1-for-ipfamily.patch of Package erlang (Revision c589bc075ed79a918315277f2ca40bc8)

Places