[glib/glib-2-72: 2/2] Merge branch 'backport-2808-socket-cancellable-glib-2-72' into 'glib-2-72'

[Michael Catanzaro <mcatanzaro src gnome org>]

commit f8b7a0e802a4f9c5b1f7de477769e0d450455ac1
Merge: 776719234a 99783e0408
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Jul 12 16:10:00 2022 +0000

    Merge branch 'backport-2808-socket-cancellable-glib-2-72' into 'glib-2-72'
    
    Backport !2808 “gsocketclient: Fix passing NULL to g_task_get_cancellable()” to glib-2-72
    
    See merge request GNOME/glib!2810

 gio/gsocketclient.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
---