From 05c8d4c663f00ffe5ddb7d12c97a3a5b0cbb9b00 Mon Sep 17 00:00:00 2001 From: Joe Shaw Date: Fri, 9 May 2003 16:34:44 +0000 Subject: [PATCH] Bump version to 1.99.21 2003-05-08 Joe Shaw * 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. --- ChangeLog | 8 ++++++++ configure.in | 2 +- libsoup/soup-queue.c | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 741371d..b741e34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-05-08 Joe Shaw + + * 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 * libsoup/soup-auth.c (ntlm_auth): If the auth status is PENDING, diff --git a/configure.in b/configure.in index c0e9756..3ca7594 100644 --- 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 --- 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; } -- 2.7.4