Work around Net::SSH2 socket bug.

See [RT#59386](https://rt.cpan.org/Public/Bug/Display.html?id=59386) for details.
bricoleurs · Jul 14, 2010 · 012900b · 012900b
1 parent 7553a22
commit 012900b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/Bric/Changes.pod b/lib/Bric/Changes.pod
@@ -103,6 +103,11 @@ no longer expires those assets unless they are active and the
 C<< <expire_date> >> element is set in the XML. Thanks to Nick Legg for the
 report (Bug # 184). [David]
 
+=item *
+
+Worked around a bug in L<Net::SSH2> where sockets weren't being closed,
+leading to L<bric_queued> running out of file descriptors. [David]
+
 =back
 
 =head1 Version 2.0.0 (2010-04-12)

diff --git a/lib/Bric/Util/Trans/SFTP.pm b/lib/Bric/Util/Trans/SFTP.pm
@@ -34,18 +34,13 @@ use Net::SSH2::SFTP;
 use Bric::Util::Fault qw(throw_gen);
 use Bric::Util::Trans::FS;
 use Bric::Config qw(:dist);
-use Bric::Util::ApacheUtil qw(unescape_uri escape_uri);
+use Bric::Util::ApacheUtil qw(unescape_uri);
 
 ################################################################################
 # Inheritance
 ################################################################################
 use base qw(Bric);
 
-################################################################################
-# Function and Closure Prototypes
-################################################################################
-my ($no_warn);
-
 ################################################################################
 # Constants
 ################################################################################
@@ -181,6 +176,7 @@ sub put_res {
         }
 
         # Disconnect.
+        $ssh2->sock->close;
         $ssh2->disconnect;
     }
     return 1;
@@ -239,6 +235,7 @@ sub del_res {
         }
 
         # Disconnect.
+        $ssh2->sock->close;
         $ssh2->disconnect;
     }
     return 1;