diff options
author | Raimo Niskanen <[email protected]> | 2016-06-09 09:27:05 +0200 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2016-06-09 09:27:05 +0200 |
commit | 2da08a037e4315a1010769b22610ca81462d813d (patch) | |
tree | ce14def3320bcbdf897a4a7a4a52f65db490c8d4 /erts/preloaded | |
parent | 7f2a5750d896febf39a51c488f57c4235e34a040 (diff) | |
parent | 16e895198a541ccbbbe6c970bd9572cf347a9c77 (diff) | |
download | otp-2da08a037e4315a1010769b22610ca81462d813d.tar.gz otp-2da08a037e4315a1010769b22610ca81462d813d.tar.bz2 otp-2da08a037e4315a1010769b22610ca81462d813d.zip |
Merge branch 'raimo/uds-support/OTP-13643'
* raimo/uds-support/OTP-13643:
Document the local (unix) address family
Remove internal state BOUND from inet_drv
Diffstat (limited to 'erts/preloaded')
-rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 76292 -> 76348 bytes | |||
-rw-r--r-- | erts/preloaded/src/prim_inet.erl | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex edb86d35a6..fdf8bbf4e2 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index 71dbfbd0a7..560810d222 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -1746,8 +1746,8 @@ enc_value_2(addr, {inet6,{IP,Port}}) -> [?INET_AF_INET6,?int16(Port)|ip6_to_bytes(IP)]; enc_value_2(addr, {local,Addr}) -> %% A binary is passed as is, but anything else will be - %% regarded as a filename and therefore UTF-8 encoded - %% if the system filename encoding flag so dictates. + %% regarded as a filename and therefore encoded according to + %% the current system filename encoding mode. Bin = if is_binary(Addr) -> |