commit 5e460432d720265b643baf64c545a368c8425ded Author: Joerg Sonnenberger Date: Mon Jan 11 17:23:10 2010 +0000 libfetch-2.27: The connection sharing didn't handle the case of active transfers correctly and tried to close the connection in that case (PR 42607). Correctly check if there is a transfer going on and just leave the connection alone in that case. diff --git a/net/libfetch/Makefile b/net/libfetch/Makefile index 34a6cfb..8f65dae 100644 --- a/net/libfetch/Makefile +++ b/net/libfetch/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2009/08/16 20:31:29 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2009/10/15 12:36:57 joerg Exp $ # -DISTNAME= libfetch-2.26 +DISTNAME= libfetch-2.27 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty diff --git a/net/libfetch/files/ftp.c b/net/libfetch/files/ftp.c index 1464c93..82a38f3 100644 --- a/net/libfetch/files/ftp.c +++ b/net/libfetch/files/ftp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.29 2009/08/16 20:31:29 joerg Exp $ */ +/* $NetBSD: ftp.c,v 1.30 2009/10/15 12:36:57 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * Copyright (c) 2008, 2009 Joerg Sonnenberger @@ -1088,7 +1088,7 @@ ftp_cached_connect(struct url *url, struct url *purl, const char *flags) return (NULL); doc = strdup(url->doc); if (doc != NULL) { - if (cached_connection) + if (cached_connection && !cached_connection->is_active) ftp_disconnect(cached_connection); cached_connection = fetch_ref(conn); memcpy(&cached_host, url, sizeof(*url));