aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-02-21 17:12:41 +0100
committerSverker Eriksson <[email protected]>2013-02-21 17:12:41 +0100
commit564d62b14907a86d877301c9500452dead479681 (patch)
treef9e8c5661144a96d1b74c9c140e5c8466dc156fe
parent4aa03cb5b54435c9007c22db1e346655a36e2948 (diff)
parenta3c0a422f66b2e08f02333aa2dd441eebab56e2d (diff)
downloadotp-564d62b14907a86d877301c9500452dead479681.tar.gz
otp-564d62b14907a86d877301c9500452dead479681.tar.bz2
otp-564d62b14907a86d877301c9500452dead479681.zip
Merge branch 'sverk/tcp-exit_on_close-false'
* sverk/tcp-exit_on_close-false: inet_drv: Fix condition to reject INET_REQ_IGNOREFD for UDP and SCTP A stab at fixing bug with {exit_on_close,false} not working
-rw-r--r--erts/emulator/drivers/common/inet_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index f0c22e9ebe..3832cf1227 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -7834,7 +7834,7 @@ static ErlDrvSSizeT inet_ctl(inet_descriptor* desc, int cmd, char* buf,
if (!IS_CONNECTED(desc))
return ctl_error(ENOTCONN, rbuf, rsize);
- if (!desc->stype == SOCK_STREAM)
+ if (desc->stype != SOCK_STREAM)
return ctl_error(EINVAL, rbuf, rsize);
if (*buf == 1 && !desc->is_ignored) {
@@ -8816,7 +8816,7 @@ static int tcp_recv_error(tcp_descriptor* desc, int err)
if (desc->inet.exitf)
driver_exit(desc->inet.port, err);
else
- desc_close(INETP(desc));
+ desc_close_read(INETP(desc));
}
return -1;
}