← Back to branch summary

~swt-techie/ubuntu/utopic/ddclient/bug-1068884

« back to all changes in this revision

Viewing changes to debian/patches/socket-timeout.diff

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2006-12-03 14:51:40 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20061203145140-6pwe4mgmwolaiwwo
Tags: 3.7.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - add quilt to build-depends
  - add lsb-base to depends
  - make init script nicer (use lsb functions)
* debian/ddclient.init: improve error message when ddclient isn't set to run
  as a daemon (Closes Ubuntu: #54102)
* debian/rules: call dh_installinit with -u multiuser (Teardown spec)
* debian/control: recommend libio-socket-ssl-perl

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/socket-timeout.diff
1
 
Index: ddclient-3.6.7/ddclient
2
 
===================================================================
3
 
--- ddclient-3.6.7.orig/ddclient        2006-04-15 12:27:28.000000000 +0200
4
 
+++ ddclient-3.6.7/ddclient     2006-04-15 12:29:11.000000000 +0200
5
 
@@ -1599,7 +1599,7 @@
6
 
        debug("skipped network connection");
7
 
        verbose("SENDING:", $request);
8
 
        
9
 
-    } elsif (! defined($sd = IO::Socket::INET->new(PeerAddr => $peer, PeerPort => $port, Proto => 'tcp', MultiHomed => 1))) {
10
 
+    } elsif (! defined($sd = IO::Socket::INET->new(PeerAddr => $peer, PeerPort => $port, Proto => 'tcp', MultiHomed => 1, Timeout => opt('timeout')))) {
11
 
        warning("cannot connect to $peer:$port socket: $@");
12
 
        
13
 
     } else {