← Back to branch summary

~ubuntu-branches/ubuntu/quantal/curl/quantal

« back to all changes in this revision

Viewing changes to lib/url.h

  • Committer: Bazaar Package Importer
  • Author(s): James Page
  • Date: 2011-10-20 09:28:24 UTC
  • mfrom: (3.4.22 sid)
  • Revision ID: james.westby@ubuntu.com-20111020092824-i7kfjd5we7dh57nv
Tags: 7.21.7-3ubuntu1
https://launchpad.net/bugs/831496
* Merge from Debian testing, remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package, stripped down for use during 
    installation (LP: #831496).
* Dropped changes:
  - debian/patches/timeout_bug_736216: applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/url.h
7
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
11
11
 *
12
12
 * This software is licensed as described in the file COPYING, which
13
13
 * you should have received as part of this distribution. The terms
37
37
CURLcode Curl_close(struct SessionHandle *data); /* opposite of curl_open() */
38
38
CURLcode Curl_connect(struct SessionHandle *, struct connectdata **,
39
39
                      bool *async, bool *protocol_connect);
40
 
CURLcode Curl_async_resolved(struct connectdata *conn,
41
 
                             bool *protocol_connect);
42
40
CURLcode Curl_do(struct connectdata **, bool *done);
43
41
CURLcode Curl_do_more(struct connectdata *);
44
42
CURLcode Curl_done(struct connectdata **, CURLcode, bool premature);
47
45
CURLcode Curl_protocol_connecting(struct connectdata *conn, bool *done);
48
46
CURLcode Curl_protocol_doing(struct connectdata *conn, bool *done);
49
47
void Curl_safefree(void *ptr);
 
48
CURLcode Curl_setup_conn(struct connectdata *conn,
 
49
                         bool *protocol_done);
50
50
 
51
51
/* create a connection cache */
52
52
struct conncache *Curl_mk_connc(int type, long amount);
82
82
void Curl_reset_reqproto(struct connectdata *conn);
83
83
 
84
84
#define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */
85
 
#define CURL_DEFAULT_SOCKS5_GSSAPI_SERVICE "rcmd" /* default socks5 gssapi service */
 
85
#define CURL_DEFAULT_SOCKS5_GSSAPI_SERVICE "rcmd" /* default socks5 gssapi
 
86
                                                     service */
86
87
 
87
88
CURLcode Curl_connected_proxy(struct connectdata *conn);
88
89