luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 10:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/tingping/socket-cancellation' into 'master'

Browse Source 
gsocketclient: Ensure task is always returned on cancel

Closes libsoup#132

See merge request GNOME/glib!647
This commit is contained in:
Michael Catanzaro 2019-02-14 18:26:17 +00:00
commit eac2b1a1c3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gsocketclient.c
View File

@ -1567,7 +1567,7 @@ g_socket_client_connected_callback (GObject *source,
GProxy *proxy; GProxy *proxy;
const gchar *protocol; const gchar *protocol;
if (g_cancellable_is_cancelled (attempt->cancellable) || task_completed_or_cancelled (data->task)) if (task_completed_or_cancelled (data->task) || g_cancellable_is_cancelled (attempt->cancellable))
{ {
g_object_unref (data->task); g_object_unref (data->task);
connection_attempt_unref (attempt); connection_attempt_unref (attempt);