[glib: 3/3] Merge branch 'wip/carlosg/cancelled-splice' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit e5c119ea417d5f6ac6dc7279a9c4b69c5e2a3037
Merge: 151e17120 cf85241ab
Author: Sebastian Dröge <slomo coaxion net>
Date:   Fri Aug 28 10:04:47 2020 +0000

    Merge branch 'wip/carlosg/cancelled-splice' into 'master'
    
    Fix splice behavior on cancellation
    
    See merge request GNOME/glib!1631

 gio/goutputstream.c                    |  9 +++++++--
 gio/tests/async-splice-output-stream.c | 27 ++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)
---