aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-03-25 15:00:42 +0100
committerPatrik Nyblom <[email protected]>2011-03-25 15:00:42 +0100
commit4d8c2a57bbaebacff9e22cfa144d009789f140c6 (patch)
tree327cf292cf06c52fad268ecd94e03f4ead557f3a /erts/emulator
parent7b8821f51620ed3cf93b6ca35e9650ced713ab85 (diff)
parent9cd782e0751294250fced1574c512586f2d1b98f (diff)
downloadotp-4d8c2a57bbaebacff9e22cfa144d009789f140c6.tar.gz
otp-4d8c2a57bbaebacff9e22cfa144d009789f140c6.tar.bz2
otp-4d8c2a57bbaebacff9e22cfa144d009789f140c6.zip
Merge branch 'pan/tcp_send_timeout/OTP-9145' into dev
* pan/tcp_send_timeout/OTP-9145: Add testcase Teach tcp_recv not to cancel send timer
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index b491242aea..59f4cfb9b4 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -8550,7 +8550,9 @@ static int tcp_deliver(tcp_descriptor* desc, int len)
len = 0;
if (!desc->inet.active) {
- driver_cancel_timer(desc->inet.port);
+ if (!desc->busy_on_send) {
+ driver_cancel_timer(desc->inet.port);
+ }
sock_select(INETP(desc),(FD_READ|FD_CLOSE),0);
if (desc->i_buf != NULL)
tcp_restart_input(desc);