Merge branch 'sg2342/fix_freebsd_sendfile/OTP-12720'

* sg2342/fix_freebsd_sendfile/OTP-12720: Fix FreeBSD sendfile
klarna · May 8, 2015 · b6b4fd2 · b6b4fd2
2 parents 0a3dbbc + daaefc2
commit b6b4fd2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
@@ -1938,6 +1938,8 @@ static void invoke_sendfile(void *data)
 	d->result_ok = 1;
 	if (d->c.sendfile.nbytes != 0)
 	  d->c.sendfile.nbytes -= nbytes;
+      } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) {
+	d->result_ok = 1;
       } else
 	d->result_ok = 0;
     } else {