summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--libsoup/soup-transfer.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cf3a0899..9966c685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2003-04-28 Dan Winship <danw@ximian.com>
- * configure.in: 1.99.19 (the all 1s and 9s release)
+ * configure.in: 1.99.20
+
+ * libsoup/soup-transfer.c (soup_transfer_read_error_cb): Make sure
+ we always call UNIGNORE_CANCEL. Might fix #41971
2003-04-25 Dan Winship <danw@ximian.com>
diff --git a/configure.in b/configure.in
index 15f1e70c..c0e9756d 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl *******************************************
AC_INIT(libsoup/soup.h)
-AM_INIT_AUTOMAKE(libsoup, 1.99.19)
+AM_INIT_AUTOMAKE(libsoup, 1.99.20)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
diff --git a/libsoup/soup-transfer.c b/libsoup/soup-transfer.c
index bc8ed882..1e5267e2 100644
--- a/libsoup/soup-transfer.c
+++ b/libsoup/soup-transfer.c
@@ -196,9 +196,9 @@ soup_transfer_read_error_cb (GIOChannel* iochannel,
}
if (r->error_cb) (*r->error_cb) (body_started, r->user_data);
- UNIGNORE_CANCEL (r);
CANCELLED:
+ UNIGNORE_CANCEL (r);
soup_transfer_read_cancel (GPOINTER_TO_INT (r));
return FALSE;