← Back to branch summary

~ubuntu-branches/ubuntu/trusty/curl/trusty-proposed

« back to all changes in this revision

Viewing changes to lib/url.h

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-12-20 09:13:22 UTC
  • mfrom: (3.4.44 sid)
  • Revision ID: package-import@ubuntu.com-20131220091322-lqk9xf5wba7vsyfh
Tags: 7.34.0-1ubuntu1
* Resynchronize on 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 undocumented Build-Depends change to automake1.9.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/url.h
70
70
#define CURL_DEFAULT_SOCKS5_GSSAPI_SERVICE "rcmd" /* default socks5 gssapi
71
71
                                                     service */
72
72
 
73
 
CURLcode Curl_connected_proxy(struct connectdata *conn);
 
73
CURLcode Curl_connected_proxy(struct connectdata *conn, int sockindex);
74
74
 
75
75
#ifdef CURL_DISABLE_VERBOSE_STRINGS
76
76
#define Curl_verboseconnect(x)  Curl_nop_stmt