~ubuntu-branches/ubuntu/wily/curl/wily-proposed

« back to all changes in this revision

Viewing changes to lib/hostip.h

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-11-10 08:48:21 UTC
  • mfrom: (3.4.52 sid)
  • Revision ID: package-import@ubuntu.com-20141110084821-inwi9tek417xe4te
Tags: 7.38.0-3ubuntu1
* Merge from Debian. Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Dropped patches:
  - debian/patches/09_fix-timeout-in-poll-and-wait.patch: upstream
  - debian/patches/CVE-2014-3613.patch: upstream
  - debian/patches/CVE-2014-3620.patch: upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
172
172
                                   char *buf, size_t bufsize);
173
173
 
174
174
/*
 
175
 * Curl_fetch_addr() fetches a 'Curl_dns_entry' already in the DNS cache.
 
176
 *
 
177
 * Returns the Curl_dns_entry entry pointer or NULL if not in the cache.
 
178
 */
 
179
struct Curl_dns_entry *
 
180
Curl_fetch_addr(struct connectdata *conn,
 
181
                const char *hostname,
 
182
                int port,
 
183
                int *stale);
 
184
 
 
185
/*
175
186
 * Curl_cache_addr() stores a 'Curl_addrinfo' struct in the DNS cache.
176
187
 *
177
188
 * Returns the Curl_dns_entry entry pointer or NULL if the storage failed.