[pkgsrc/trunk]: pkgsrc/net/libfetch libfetch-2.27:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b05dc86d943f
branches:  trunk
changeset: 569163:b05dc86d943f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jan 11 17:23:10 2010 +0000

description:
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.

diffstat:

 net/libfetch/Makefile    |  4 ++--
 net/libfetch/files/ftp.c |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 0ef82f080e90 -r b05dc86d943f net/libfetch/Makefile
--- a/net/libfetch/Makefile     Mon Jan 11 16:18:13 2010 +0000
+++ b/net/libfetch/Makefile     Mon Jan 11 17:23:10 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2009/10/15 12:36:57 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2010/01/11 17:23:10 joerg Exp $
 #
 
-DISTNAME=      libfetch-2.26
+DISTNAME=      libfetch-2.27
 CATEGORIES=    net
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 0ef82f080e90 -r b05dc86d943f net/libfetch/files/ftp.c
--- a/net/libfetch/files/ftp.c  Mon Jan 11 16:18:13 2010 +0000
+++ b/net/libfetch/files/ftp.c  Mon Jan 11 17:23:10 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftp.c,v 1.30 2009/10/15 12:36:57 joerg Exp $   */
+/*     $NetBSD: ftp.c,v 1.31 2010/01/11 17:23:10 joerg Exp $   */
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>
@@ -1088,7 +1088,7 @@
                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));