Bump version to 1.99.21

2003-05-08  Joe Shaw  <joe@ximian.com>

	* configure.in: Bump version to 1.99.21

	* libsoup/soup-queue.c (proxy_connect): If the proxy HTTPS
	tunnelling fails, the other message which shares our same
	connection will free it first, so set ours to NULL.

diff --git a/ChangeLog b/ChangeLog
index 741371d..b741e34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-08  Joe Shaw  <joe@ximian.com>
+
+       * configure.in: Bump version to 1.99.21
+
+       * libsoup/soup-queue.c (proxy_connect): If the proxy HTTPS
+       tunnelling fails, the other message which shares our same
+       connection will free it first, so set ours to NULL.
+
 2003-05-08  Dan Winship  <danw@ximian.com>
 
        * libsoup/soup-auth.c (ntlm_auth): If the auth status is PENDING,

diff --git a/configure.in b/configure.in
index c0e9756..3ca7594 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl *******************************************
 
 AC_INIT(libsoup/soup.h)
 
-AM_INIT_AUTOMAKE(libsoup, 1.99.20)
+AM_INIT_AUTOMAKE(libsoup, 1.99.21)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET

diff --git a/libsoup/soup-queue.c b/libsoup/soup-queue.c
index 0246b1b..6511975 100644 (file)
--- a/libsoup/soup-queue.c
+++ b/libsoup/soup-queue.c
@@ -609,6 +609,13 @@ proxy_connect (SoupContext *ctx, SoupMessage *req, SoupConnection *conn)
                                "Unable to create secure data "
                                "tunnel through proxy");
 
+                       /*
+                        * If the tunnelling failed, our connection will
+                        * have been freed by the requeue in
+                        * proxy_https_connect()
+                        */
+                       req->connection = NULL;
+
                        soup_message_issue_callback (req);
                        return TRUE;
                }