aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-12-28 13:55:47 +0100
committerZandra <[email protected]>2015-12-28 13:55:47 +0100
commiteb8c76c5672f71b860a7b05390e7f1ecbb6e1b9e (patch)
tree5bc605d790b46038324cb89a7b676295959470a3
parentdbd58427c1447af394ea5449cb4cdc32e446918b (diff)
parent128fc752a45d51beb71c1aea4d5433efd00ac02a (diff)
downloadotp-eb8c76c5672f71b860a7b05390e7f1ecbb6e1b9e.tar.gz
otp-eb8c76c5672f71b860a7b05390e7f1ecbb6e1b9e.tar.bz2
otp-eb8c76c5672f71b860a7b05390e7f1ecbb6e1b9e.zip
Merge branch 'binarin/maint' into maint
* binarin/maint: Don't wait for twice the delay_write timeout OTP-13220
-rw-r--r--erts/epmd/src/epmd_srv.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 8c8d7304f2..5b58554590 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -700,9 +700,6 @@ static void do_request(g, fd, s, buf, bsize)
put_int16(node->creation, wbuf+2);
}
- if (g->delay_write) /* Test of busy server */
- sleep(g->delay_write);
-
if (reply(g, fd, wbuf, 4) != 4)
{
dbg_tty_printf(g,1,"** failed to send ALIVE2_RESP for \"%s\"",