diff options
| author | Hans Nilsson <[email protected]> | 2018-04-20 11:51:05 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-20 11:51:05 +0200 |
| commit | 0343b68b053ee97b2ef70ea07b9aa87e8842c591 (patch) | |
| tree | 27e2f211cb8082896699873dce95fa71f2c3f8b7 /lib/erl_interface/src/connect/ei_resolve.c | |
| parent | f15f615f9185077b02c011ac28257e8365c01e75 (diff) | |
| parent | f2c1d537dc28ffbde5d42aedec70bf4c6574c3ea (diff) | |
| download | otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.gz otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.bz2 otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
erl_interface: Optimize latin1_to_utf8 and friend
inets: Fix broken httpc options handling
erl_interface: Fix ei_connect
ssh: Fix server crashes for exit-normal signals
ssh: Fix ssh_sftpd:handle_op not returning State
ic: Optimize oe_ei_encode_atom
Diffstat (limited to 'lib/erl_interface/src/connect/ei_resolve.c')
| -rw-r--r-- | lib/erl_interface/src/connect/ei_resolve.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c index fd0c659373..2757735d39 100644 --- a/lib/erl_interface/src/connect/ei_resolve.c +++ b/lib/erl_interface/src/connect/ei_resolve.c @@ -645,8 +645,11 @@ struct hostent *ei_gethostbyname_r(const char *name, #else #if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__)) struct hostent *result; + int err; - gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop); + err = gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop); + if (err == ERANGE) + *h_errnop = err; return result; #else |