← Back to branch summary

~vorlon/ubuntu/natty/curl/multiarch

« back to all changes in this revision

Viewing changes to lib/connect.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-04-29 11:10:29 UTC
  • mfrom: (3.2.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090429111029-2j5eiyokfw2bw049
Tags: 7.19.4-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop build dependencies: stunnel, libdb4.6-dev, libssh2-1-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Call automake-1.9 with --add-missing --copy --force
* drop debian/patches/security_CVE-2009-0037.patch 
  - this patch is part of 7.19.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/connect.h
20
20
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
21
 * KIND, either express or implied.
22
22
 *
23
 
 * $Id: connect.h,v 1.25 2008-05-12 21:43:28 bagder Exp $
 
23
 * $Id: connect.h,v 1.26 2008-11-03 16:24:56 bagder Exp $
24
24
 ***************************************************************************/
25
25
 
26
26
int Curl_nonblock(curl_socket_t sockfd,    /* operate on this */
37
37
                          Curl_addrinfo **addr, /* the one we used */
38
38
                          bool *connected); /* truly connected? */
39
39
 
40
 
CURLcode Curl_store_ip_addr(struct connectdata *conn);
41
 
 
42
40
/* generic function that returns how much time there's left to run, according
43
41
   to the timeouts set */
44
42
long Curl_timeleft(struct connectdata *conn,