aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-04-12 14:34:29 +0200
committerSverker Eriksson <[email protected]>2016-04-12 14:34:29 +0200
commit5b31b2196bbb13ba650207f4ef94b2e1fa8f6121 (patch)
tree83fc5838313f141a4f53cf5b826f0101f96a4f06 /erts/epmd/src
parent7db616041e97e88cac64d13ab5289c3d64698382 (diff)
parent415dc5b637624b8f3dc08fcf881e941a555f93da (diff)
downloadotp-5b31b2196bbb13ba650207f4ef94b2e1fa8f6121.tar.gz
otp-5b31b2196bbb13ba650207f4ef94b2e1fa8f6121.tar.bz2
otp-5b31b2196bbb13ba650207f4ef94b2e1fa8f6121.zip
Merge branch 'patch-2' of https://github.com/michaelklishin/otp
Diffstat (limited to 'erts/epmd/src')
-rw-r--r--erts/epmd/src/epmd_int.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h
index e127eff097..98a7404cfe 100644
--- a/erts/epmd/src/epmd_int.h
+++ b/erts/epmd/src/epmd_int.h
@@ -237,8 +237,8 @@ static const struct in6_addr in6addr_loopback =
#define EPMD_TRUE 1
/* If no activity we let select() return every IDLE_TIMEOUT second
- A file descriptor that are idle for CLOSE_TIMEOUT seconds and
- isn't a ALIVE socket is probably hanging and we close it */
+ A file descriptor that has been idle for CLOSE_TIMEOUT seconds and
+ isn't an ALIVE socket has probably hanged and should be closed */
#define IDLE_TIMEOUT 5
#define CLOSE_TIMEOUT 60