aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-10-18 12:28:29 +0200
committerHenrik Nord <[email protected]>2012-10-18 12:28:37 +0200
commitb30b0a3c0197c2b500849b01f7f9d6f7c6eb831a (patch)
tree5877b5fbd5b05b2ad9256a53356a9e9daedaa8e0 /erts/emulator
parent8b201631300556d5e93556062f7a615cdd1a6708 (diff)
parent5030da383c44c66aca861b3a56d0e310d7de6997 (diff)
downloadotp-b30b0a3c0197c2b500849b01f7f9d6f7c6eb831a.tar.gz
otp-b30b0a3c0197c2b500849b01f7f9d6f7c6eb831a.tar.bz2
otp-b30b0a3c0197c2b500849b01f7f9d6f7c6eb831a.zip
Merge branch 'jf/fix_sctp_peeloff_active_true'
* jf/fix_sctp_peeloff_active_true: Set new peeled off SCTP socket to nonblocking socket SCTP test case with socket active options once and true OTP-10491
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index dea910e89f..80f504a361 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -10095,6 +10095,7 @@ static ErlDrvSSizeT packet_inet_ctl(ErlDrvData e, unsigned int cmd, char* buf,
}
new_udesc->inet.state = INET_STATE_CONNECTED;
new_udesc->inet.stype = SOCK_STREAM;
+ SET_NONBLOCKING(new_udesc->inet.s);
inet_reply_ok_port(desc, new_udesc->inet.dport);
(*rbuf)[0] = INET_REP;