← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/curl/curl.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu Merge-o-Matic
  • Date: 2013-08-12 15:39:32 UTC
  • mfrom: (3.4.41 sid)
  • Revision ID: package-import@ubuntu.com-20130812153932-pmn0qwvy9vghe66x
Tags: 7.32.0-1ubuntu1
https://launchpad.net/bugs/1220928
* Merge from Debian unstable.  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.
* Fixes freeipa-client join. (LP: #1220928)

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/curl/curl.h
156
156
                                       HTTPPOST_CALLBACK posts */
157
157
};
158
158
 
 
159
/* This is the CURLOPT_PROGRESSFUNCTION callback proto. It is now considered
 
160
   deprecated but was the only choice up until 7.31.0 */
159
161
typedef int (*curl_progress_callback)(void *clientp,
160
162
                                      double dltotal,
161
163
                                      double dlnow,
162
164
                                      double ultotal,
163
165
                                      double ulnow);
164
166
 
 
167
/* This is the CURLOPT_XFERINFOFUNCTION callback proto. It was introduced in
 
168
   7.32.0, it avoids floating point and provides more detailed information. */
 
169
typedef int (*curl_xferinfo_callback)(void *clientp,
 
170
                                      curl_off_t dltotal,
 
171
                                      curl_off_t dlnow,
 
172
                                      curl_off_t ultotal,
 
173
                                      curl_off_t ulnow);
 
174
 
165
175
#ifndef CURL_MAX_WRITE_SIZE
166
176
  /* Tests have proven that 20K is a very bad buffer size for uploads on
167
177
     Windows, while 16K for some odd reason performed a lot better.
968
978
 
969
979
  /* 55 = OBSOLETE */
970
980
 
971
 
  /* Function that will be called instead of the internal progress display
 
981
  /* DEPRECATED
 
982
   * Function that will be called instead of the internal progress display
972
983
   * function. This function should be defined as the curl_progress_callback
973
984
   * prototype defines. */
974
985
  CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
975
986
 
976
 
  /* Data passed to the progress callback */
 
987
  /* Data passed to the CURLOPT_PROGRESSFUNCTION and CURLOPT_XFERINFOFUNCTION
 
988
     callbacks */
977
989
  CINIT(PROGRESSDATA, OBJECTPOINT, 57),
 
990
#define CURLOPT_XFERINFODATA CURLOPT_PROGRESSDATA
978
991
 
979
992
  /* We want the referrer field set automatically when following locations */
980
993
  CINIT(AUTOREFERER, LONG, 58),
1533
1546
  /* Enable/disable SASL initial response */
1534
1547
  CINIT(SASL_IR, LONG, 218),
1535
1548
 
 
1549
  /* Function that will be called instead of the internal progress display
 
1550
   * function. This function should be defined as the curl_xferinfo_callback
 
1551
   * prototype defines. (Deprecates CURLOPT_PROGRESSFUNCTION) */
 
1552
  CINIT(XFERINFOFUNCTION, FUNCTIONPOINT, 219),
 
1553
 
1536
1554
  CURLOPT_LASTENTRY /* the last unused */
1537
1555
} CURLoption;
1538
1556