← Back to branch summary

~ubuntu-branches/ubuntu/precise/curl/precise-proposed

« back to all changes in this revision

Viewing changes to lib/hostip.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2011-11-25 17:30:45 UTC
  • mfrom: (3.4.23 sid)
  • Revision ID: package-import@ubuntu.com-20111125173045-2l3ni88jv16kath0
Tags: 7.22.0-3ubuntu1
* Merge from Debian unstable, remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/hostip.c
22
22
 
23
23
#include "setup.h"
24
24
 
25
 
#include <string.h>
26
 
 
27
25
#ifdef HAVE_SYS_SOCKET_H
28
26
#include <sys/socket.h>
29
27
#endif
36
34
#ifdef HAVE_ARPA_INET_H
37
35
#include <arpa/inet.h>
38
36
#endif
39
 
#ifdef HAVE_STDLIB_H
40
 
#include <stdlib.h>     /* required for free() prototypes */
41
 
#endif
42
37
#ifdef HAVE_UNISTD_H
43
38
#include <unistd.h>     /* for the close() proto */
44
39
#endif
45
40
#ifdef __VMS
46
41
#include <in.h>
47
42
#include <inet.h>
48
 
#include <stdlib.h>
49
43
#endif
50
44
 
51
45
#ifdef HAVE_SETJMP_H
560
554
 
561
555
  *entry = NULL;
562
556
 
 
557
  if(timeoutms < 0)
 
558
    /* got an already expired timeout */
 
559
    return CURLRESOLV_TIMEDOUT;
 
560
 
563
561
#ifdef USE_ALARM_TIMEOUT
564
562
  if(data->set.no_signal)
565
563
    /* Ignore the timeout when signals are disabled */