diff options
| author | Patrik Nyblom <[email protected]> | 2011-03-25 14:59:43 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-03-25 14:59:43 +0100 |
| commit | e88b203c8b8e725aa083a5018e92395a85c9dac3 (patch) | |
| tree | 6d84cea21a361f0d8fb19a733b8204ef424285a4 /erts | |
| parent | 69c258c2ce9e0b43ec0bcbba442d1779b6b37fb7 (diff) | |
| parent | 9cd782e0751294250fced1574c512586f2d1b98f (diff) | |
| download | otp-e88b203c8b8e725aa083a5018e92395a85c9dac3.tar.gz otp-e88b203c8b8e725aa083a5018e92395a85c9dac3.tar.bz2 otp-e88b203c8b8e725aa083a5018e92395a85c9dac3.zip | |
Merge branch 'pan/tcp_send_timeout/OTP-9145' of super:pan_otp into pan/valgrind_xml_log
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 |
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); |