~ubuntu-branches/ubuntu/saucy/curl/saucy-201307251546

« back to all changes in this revision

Viewing changes to lib/http_proxy.h

  • Committer: Package Import Robot
  • Author(s): Alessandro Ghedini
  • Date: 2012-03-23 16:24:51 UTC
  • mto: (3.6.1 experimental) (1.3.1)
  • mto: This revision was merged to the branch mainline in revision 59.
  • Revision ID: package-import@ubuntu.com-20120323162451-z4gstlabjkgnrh7h
Tags: upstream-7.25.0
ImportĀ upstreamĀ versionĀ 7.25.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2012, 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
21
21
 * KIND, either express or implied.
22
22
 *
23
23
 ***************************************************************************/
 
24
 
24
25
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
25
26
/* ftp can use this as well */
26
27
CURLcode Curl_proxyCONNECT(struct connectdata *conn,
30
31
/* Default proxy timeout in milliseconds */
31
32
#define PROXY_TIMEOUT (3600*1000)
32
33
 
 
34
CURLcode Curl_proxy_connect(struct connectdata *conn);
 
35
 
33
36
#else
34
37
#define Curl_proxyCONNECT(x,y,z,w) CURLE_NOT_BUILT_IN
 
38
#define Curl_proxy_connect(x) CURLE_OK
35
39
#endif
36
40
 
37
41
#endif /* HEADER_CURL_HTTP_PROXY_H */