[glib/glib-2-64: 3/3] Merge branch 'backport-1631-splice-cancellation-glib-2-64' into 'glib-2-64'

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

commit 1659dd7a4dbbd253c77ef068b4b388335f1af848
Merge: 2560f6137 1b03204e6
Author: Sebastian Dröge <slomo coaxion net>
Date:   Thu Sep 3 09:33:40 2020 +0000

    Merge branch 'backport-1631-splice-cancellation-glib-2-64' into 'glib-2-64'
    
    Backport !1631 “Fix splice behavior on cancellation” to glib-2-64
    
    See merge request GNOME/glib!1634

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