Script for building curl-7.48.0
authorDirk Zimmermann <dirk@pep-project.org>
Wed, 20 Apr 2016 15:40:00 +0200
changeset 531a7cc26cc39f2
parent 530 e532b2e282f3
child 532 7a51ba504431
Script for building curl-7.48.0
build-mac/build-libcurl-ios.sh
build-mac/build.sh
build-mac/build_libcurl_dist.sh
build-mac/curl-7.48.0.tar.gz.asc
build-mac/curl/curl.h
build-mac/curl/curlbuild.h
build-mac/curl/curlbuild32.h
build-mac/curl/curlbuild64.h
build-mac/curl/curlbuild_.h
build-mac/curl/curlrules.h
build-mac/curl/curlver.h
build-mac/curl/easy.h
build-mac/curl/mprintf.h
build-mac/curl/multi.h
build-mac/curl/stdcheaders.h
build-mac/curl/typecheck-gcc.h
build-mac/libcurl.a
build-mac/pEpEngine.xcodeproj/project.pbxproj
     1.1 --- a/build-mac/build-libcurl-ios.sh	Wed Apr 20 14:49:57 2016 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,53 +0,0 @@
     1.4 -#!/bin/bash
     1.5 -
     1.6 -export IPHONEOS_DEPLOYMENT_TARGET="6.0"
     1.7 -export CC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
     1.8 -
     1.9 -ARCH="armv7"
    1.10 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    1.11 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    1.12 -make distclean
    1.13 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    1.14 -make -j `sysctl -n hw.logicalcpu_max`
    1.15 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    1.16 -cp include/curl/curlbuild.h ~/Desktop/curlbuild32.h
    1.17 -
    1.18 -ARCH="armv7s"
    1.19 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    1.20 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    1.21 -make distclean
    1.22 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    1.23 -make -j `sysctl -n hw.logicalcpu_max`
    1.24 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    1.25 -
    1.26 -ARCH="arm64"
    1.27 -export IPHONEOS_DEPLOYMENT_TARGET="7.0"
    1.28 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    1.29 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
    1.30 -make distclean
    1.31 -./configure --disable-shared --enable-static --host="aarch64-apple-darwin" --enable-threaded-resolver --with-darwinssl
    1.32 -make -j `sysctl -n hw.logicalcpu_max`
    1.33 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    1.34 -cp include/curl/curlbuild.h ~/Desktop/curlbuild64.h
    1.35 -
    1.36 -ARCH="i386"
    1.37 -export IPHONEOS_DEPLOYMENT_TARGET="6.0"
    1.38 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    1.39 -export CPPFLAGS="-D__IPHONE_OS_VERSION_MIN_REQUIRED=${IPHONEOS_DEPLOYMENT_TARGET%%.*}0000"
    1.40 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    1.41 -make distclean
    1.42 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    1.43 -make -j `sysctl -n hw.logicalcpu_max`
    1.44 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    1.45 -
    1.46 -ARCH="x86_64"
    1.47 -export IPHONEOS_DEPLOYMENT_TARGET="7.0"
    1.48 -export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    1.49 -export CPPFLAGS="-D__IPHONE_OS_VERSION_MIN_REQUIRED=${IPHONEOS_DEPLOYMENT_TARGET%%.*}0000"
    1.50 -export LDFLAGS="-arch ${ARCH} -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
    1.51 -make distclean
    1.52 -./configure --disable-shared --enable-static --host="${ARCH}-apple-darwin" --enable-threaded-resolver --with-darwinssl
    1.53 -make -j `sysctl -n hw.logicalcpu_max`
    1.54 -cp lib/.libs/libcurl.a "${HOME}/Desktop/libcurl-${ARCH}.a"
    1.55 -
    1.56 -lipo -create -output "${HOME}/Desktop/libcurl.a" "${HOME}/Desktop/libcurl-armv7.a" "${HOME}/Desktop/libcurl-armv7s.a" "${HOME}/Desktop/libcurl-arm64.a" "${HOME}/Desktop/libcurl-i386.a" "${HOME}/Desktop/libcurl-x86_64.a"
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/build-mac/build.sh	Wed Apr 20 15:40:00 2016 +0200
     2.3 @@ -0,0 +1,25 @@
     2.4 +#!/bin/bash
     2.5 +
     2.6 +#
     2.7 +# Invoke with `sh build.sh`
     2.8 +#
     2.9 +
    2.10 +set -e
    2.11 +
    2.12 +rm -f libcurl.a
    2.13 +rm -fr curl
    2.14 +
    2.15 +wget https://curl.haxx.se/download/curl-7.48.0.tar.gz
    2.16 +gpg2 --verify curl-7.48.0.tar.gz.asc
    2.17 +tar xf curl-7.48.0.tar.gz
    2.18 +pushd curl-7.48.0
    2.19 +bash ../build_libcurl_dist.sh
    2.20 +popd
    2.21 +mv libcurl-ios-dist/lib/libcurl.a .
    2.22 +
    2.23 +#exit 1
    2.24 +
    2.25 +mv libcurl-ios-dist/include/curl .
    2.26 +rm -fr libcurl-ios-dist/
    2.27 +rm -fr curl-7.48.0
    2.28 +rm curl-7.48.0.tar.gz
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/build-mac/build_libcurl_dist.sh	Wed Apr 20 15:40:00 2016 +0200
     3.3 @@ -0,0 +1,62 @@
     3.4 +#!/bin/bash
     3.5 +
     3.6 +export DEVROOT=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
     3.7 +DFT_DIST_DIR=../libcurl-ios-dist
     3.8 +DIST_DIR=${DIST_DIR:-$DFT_DIST_DIR}
     3.9 +
    3.10 +function check_curl_ver() {
    3.11 +echo "#include \"include/curl/curlver.h\"
    3.12 +#if LIBCURL_VERSION_MAJOR < 7 || LIBCURL_VERSION_MINOR < 40
    3.13 +#error Required curl 7.40.0+; See http://curl.haxx.se/docs/adv_20150108A.html
    3.14 +#endif"|gcc -c -o /dev/null -xc -||exit 9
    3.15 +}
    3.16 +
    3.17 +function build_for_arch() {
    3.18 +  ARCH=$1
    3.19 +  HOST=$2
    3.20 +  SYSROOT=$3
    3.21 +  PREFIX=$4
    3.22 +  IPHONEOS_DEPLOYMENT_TARGET="6.0"
    3.23 +  export PATH="${DEVROOT}/usr/bin/:${PATH}"
    3.24 +  export CFLAGS="-arch ${ARCH} -pipe -Os -gdwarf-2 -isysroot ${SYSROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET} -fembed-bitcode"
    3.25 +  export LDFLAGS="-arch ${ARCH} -isysroot ${SYSROOT}"
    3.26 +  ./configure --disable-shared --enable-static ${SSL_FLAG} --host="${HOST}" --prefix=${PREFIX} && make -j8 && make install
    3.27 +}
    3.28 +
    3.29 +if [ "$1" == "openssl" ]
    3.30 +then
    3.31 +  if [ ! -d ${HOME}/Desktop/openssl-ios-dist ]
    3.32 +  then
    3.33 +    echo "Please use https://github.com/sinofool/build-openssl-ios/ to build OpenSSL for iOS first"
    3.34 +    exit 8
    3.35 +  fi
    3.36 +  export SSL_FLAG=--with-ssl=${HOME}/Desktop/openssl-ios-dist
    3.37 +else
    3.38 +  check_curl_ver
    3.39 +  export SSL_FLAG=--with-darwinssl
    3.40 +fi
    3.41 +
    3.42 +TMP_DIR=/tmp/build_libcurl_$$
    3.43 +
    3.44 +build_for_arch i386 i386-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/i386 || exit 1
    3.45 +build_for_arch x86_64 x86_64-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/x86_64 || exit 2
    3.46 +build_for_arch arm64 arm-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/arm64 || exit 3
    3.47 +build_for_arch armv7s armv7s-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7s || exit 4
    3.48 +build_for_arch armv7 armv7-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7 || exit 5
    3.49 +
    3.50 +mkdir -p ${TMP_DIR}/lib/
    3.51 +${DEVROOT}/usr/bin/lipo \
    3.52 +	-arch i386 ${TMP_DIR}/i386/lib/libcurl.a \
    3.53 +	-arch x86_64 ${TMP_DIR}/x86_64/lib/libcurl.a \
    3.54 +	-arch armv7 ${TMP_DIR}/armv7/lib/libcurl.a \
    3.55 +	-arch armv7s ${TMP_DIR}/armv7s/lib/libcurl.a \
    3.56 +	-arch arm64 ${TMP_DIR}/arm64/lib/libcurl.a \
    3.57 +	-output ${TMP_DIR}/lib/libcurl.a -create
    3.58 +
    3.59 +cp -r ${TMP_DIR}/armv7s/include ${TMP_DIR}/
    3.60 +curl -O https://raw.githubusercontent.com/sinofool/build-libcurl-ios/master/patch-include.patch
    3.61 +patch ${TMP_DIR}/include/curl/curlbuild.h < patch-include.patch
    3.62 +
    3.63 +mkdir -p ${DIST_DIR}
    3.64 +cp -r ${TMP_DIR}/include ${TMP_DIR}/lib ${DIST_DIR}
    3.65 +
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/build-mac/curl-7.48.0.tar.gz.asc	Wed Apr 20 15:40:00 2016 +0200
     4.3 @@ -0,0 +1,7 @@
     4.4 +-----BEGIN PGP SIGNATURE-----
     4.5 +Version: GnuPG v1
     4.6 +
     4.7 +iEYEABECAAYFAlbyPpsACgkQeOEcayedXJHUPwCg3XT9+/cTF0vSBZo6fA9T2PC0
     4.8 +WdAAnArdVGI5GVP7SW0wPogEb03qSXPJ
     4.9 +=H/Vf
    4.10 +-----END PGP SIGNATURE-----
     5.1 --- a/build-mac/curl/curl.h	Wed Apr 20 14:49:57 2016 +0200
     5.2 +++ b/build-mac/curl/curl.h	Wed Apr 20 15:40:00 2016 +0200
     5.3 @@ -11,7 +11,7 @@
     5.4   *
     5.5   * This software is licensed as described in the file COPYING, which
     5.6   * you should have received as part of this distribution. The terms
     5.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
     5.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
     5.9   *
    5.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    5.11   * copies of the Software, and permit persons to whom the Software is
    5.12 @@ -24,10 +24,10 @@
    5.13  
    5.14  /*
    5.15   * If you have libcurl problems, all docs and details are found here:
    5.16 - *   http://curl.haxx.se/libcurl/
    5.17 + *   https://curl.haxx.se/libcurl/
    5.18   *
    5.19   * curl-library mailing list subscription and unsubscription web interface:
    5.20 - *   http://cool.haxx.se/mailman/listinfo/curl-library/
    5.21 + *   https://cool.haxx.se/mailman/listinfo/curl-library/
    5.22   */
    5.23  
    5.24  #include "curlver.h"         /* libcurl version defines   */
    5.25 @@ -56,7 +56,8 @@
    5.26  #include <time.h>
    5.27  
    5.28  #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
    5.29 -#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || defined(__LWIP_OPT_H__))
    5.30 +#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
    5.31 +      defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
    5.32  /* The check above prevents the winsock2 inclusion if winsock.h already was
    5.33     included, since they can't co-exist without problems */
    5.34  #include <winsock2.h>
    5.35 @@ -112,7 +113,7 @@
    5.36  
    5.37  #ifndef curl_socket_typedef
    5.38  /* socket typedef */
    5.39 -#if defined(WIN32) && !defined(__LWIP_OPT_H__)
    5.40 +#if defined(WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)
    5.41  typedef SOCKET curl_socket_t;
    5.42  #define CURL_SOCKET_BAD INVALID_SOCKET
    5.43  #else
    5.44 @@ -127,7 +128,8 @@
    5.45    char *name;                       /* pointer to allocated name */
    5.46    long namelength;                  /* length of name length */
    5.47    char *contents;                   /* pointer to allocated data contents */
    5.48 -  long contentslength;              /* length of contents field */
    5.49 +  long contentslength;              /* length of contents field, see also
    5.50 +                                       CURL_HTTPPOST_LARGE */
    5.51    char *buffer;                     /* pointer to allocated buffer contents */
    5.52    long bufferlength;                /* length of buffer field */
    5.53    char *contenttype;                /* Content-Type */
    5.54 @@ -136,24 +138,33 @@
    5.55                                         file, this link should link to following
    5.56                                         files */
    5.57    long flags;                       /* as defined below */
    5.58 -#define HTTPPOST_FILENAME (1<<0)    /* specified content is a file name */
    5.59 -#define HTTPPOST_READFILE (1<<1)    /* specified content is a file name */
    5.60 -#define HTTPPOST_PTRNAME (1<<2)     /* name is only stored pointer
    5.61 -                                       do not free in formfree */
    5.62 -#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
    5.63 -                                       do not free in formfree */
    5.64 -#define HTTPPOST_BUFFER (1<<4)      /* upload file from buffer */
    5.65 -#define HTTPPOST_PTRBUFFER (1<<5)   /* upload file from pointer contents */
    5.66 -#define HTTPPOST_CALLBACK (1<<6)    /* upload file contents by using the
    5.67 -                                       regular read callback to get the data
    5.68 -                                       and pass the given pointer as custom
    5.69 -                                       pointer */
    5.70 +
    5.71 +/* specified content is a file name */
    5.72 +#define CURL_HTTPPOST_FILENAME (1<<0)
    5.73 +/* specified content is a file name */
    5.74 +#define CURL_HTTPPOST_READFILE (1<<1)
    5.75 +/* name is only stored pointer do not free in formfree */
    5.76 +#define CURL_HTTPPOST_PTRNAME (1<<2)
    5.77 +/* contents is only stored pointer do not free in formfree */
    5.78 +#define CURL_HTTPPOST_PTRCONTENTS (1<<3)
    5.79 +/* upload file from buffer */
    5.80 +#define CURL_HTTPPOST_BUFFER (1<<4)
    5.81 +/* upload file from pointer contents */
    5.82 +#define CURL_HTTPPOST_PTRBUFFER (1<<5)
    5.83 +/* upload file contents by using the regular read callback to get the data and
    5.84 +   pass the given pointer as custom pointer */
    5.85 +#define CURL_HTTPPOST_CALLBACK (1<<6)
    5.86 +/* use size in 'contentlen', added in 7.46.0 */
    5.87 +#define CURL_HTTPPOST_LARGE (1<<7)
    5.88  
    5.89    char *showfilename;               /* The file name to show. If not set, the
    5.90                                         actual file name will be used (if this
    5.91                                         is a file part) */
    5.92    void *userp;                      /* custom pointer used for
    5.93                                         HTTPPOST_CALLBACK posts */
    5.94 +  curl_off_t contentlen;            /* alternative length of contents
    5.95 +                                       field. Used if CURL_HTTPPOST_LARGE is
    5.96 +                                       set. Added in 7.46.0 */
    5.97  };
    5.98  
    5.99  /* This is the CURLOPT_PROGRESSFUNCTION callback proto. It is now considered
   5.100 @@ -725,6 +736,10 @@
   5.101     servers, a user can this way allow the vulnerability back. */
   5.102  #define CURLSSLOPT_ALLOW_BEAST (1<<0)
   5.103  
   5.104 +/* - NO_REVOKE tells libcurl to disable certificate revocation checks for those
   5.105 +   SSL backends where such behavior is present. */
   5.106 +#define CURLSSLOPT_NO_REVOKE (1<<1)
   5.107 +
   5.108  #ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
   5.109                            the obsolete stuff removed! */
   5.110  
   5.111 @@ -814,9 +829,13 @@
   5.112     but 32 */
   5.113  #define CURLOPTTYPE_LONG          0
   5.114  #define CURLOPTTYPE_OBJECTPOINT   10000
   5.115 +#define CURLOPTTYPE_STRINGPOINT   10000
   5.116  #define CURLOPTTYPE_FUNCTIONPOINT 20000
   5.117  #define CURLOPTTYPE_OFF_T         30000
   5.118  
   5.119 +/* *STRINGPOINT is an alias for OBJECTPOINT to allow tools to extract the
   5.120 +   string options from the header file */
   5.121 +
   5.122  /* name is uppercase CURLOPT_<name>,
   5.123     type is one of the defined CURLOPTTYPE_<type>
   5.124     number is unique identifier */
   5.125 @@ -830,6 +849,7 @@
   5.126  /* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
   5.127  #define LONG          CURLOPTTYPE_LONG
   5.128  #define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
   5.129 +#define STRINGPOINT   CURLOPTTYPE_OBJECTPOINT
   5.130  #define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
   5.131  #define OFF_T         CURLOPTTYPE_OFF_T
   5.132  #define CINIT(name,type,number) CURLOPT_/**/name = type + number
   5.133 @@ -846,22 +866,22 @@
   5.134    CINIT(WRITEDATA, OBJECTPOINT, 1),
   5.135  
   5.136    /* The full URL to get/put */
   5.137 -  CINIT(URL, OBJECTPOINT, 2),
   5.138 +  CINIT(URL, STRINGPOINT, 2),
   5.139  
   5.140    /* Port number to connect to, if other than default. */
   5.141    CINIT(PORT, LONG, 3),
   5.142  
   5.143    /* Name of proxy to use. */
   5.144 -  CINIT(PROXY, OBJECTPOINT, 4),
   5.145 +  CINIT(PROXY, STRINGPOINT, 4),
   5.146  
   5.147    /* "user:password;options" to use when fetching. */
   5.148 -  CINIT(USERPWD, OBJECTPOINT, 5),
   5.149 +  CINIT(USERPWD, STRINGPOINT, 5),
   5.150  
   5.151    /* "user:password" to use with proxy. */
   5.152 -  CINIT(PROXYUSERPWD, OBJECTPOINT, 6),
   5.153 +  CINIT(PROXYUSERPWD, STRINGPOINT, 6),
   5.154  
   5.155    /* Range to get, specified as an ASCII string. */
   5.156 -  CINIT(RANGE, OBJECTPOINT, 7),
   5.157 +  CINIT(RANGE, STRINGPOINT, 7),
   5.158  
   5.159    /* not used */
   5.160  
   5.161 @@ -898,14 +918,14 @@
   5.162    CINIT(POSTFIELDS, OBJECTPOINT, 15),
   5.163  
   5.164    /* Set the referrer page (needed by some CGIs) */
   5.165 -  CINIT(REFERER, OBJECTPOINT, 16),
   5.166 +  CINIT(REFERER, STRINGPOINT, 16),
   5.167  
   5.168    /* Set the FTP PORT string (interface name, named or numerical IP address)
   5.169       Use i.e '-' to use default address. */
   5.170 -  CINIT(FTPPORT, OBJECTPOINT, 17),
   5.171 +  CINIT(FTPPORT, STRINGPOINT, 17),
   5.172  
   5.173    /* Set the User-Agent string (examined by some CGIs) */
   5.174 -  CINIT(USERAGENT, OBJECTPOINT, 18),
   5.175 +  CINIT(USERAGENT, STRINGPOINT, 18),
   5.176  
   5.177    /* If the download receives less than "low speed limit" bytes/second
   5.178     * during "low speed time" seconds, the operations is aborted.
   5.179 @@ -928,7 +948,7 @@
   5.180    CINIT(RESUME_FROM, LONG, 21),
   5.181  
   5.182    /* Set cookie in request: */
   5.183 -  CINIT(COOKIE, OBJECTPOINT, 22),
   5.184 +  CINIT(COOKIE, STRINGPOINT, 22),
   5.185  
   5.186    /* This points to a linked list of headers, struct curl_slist kind. This
   5.187       list is also used for RTSP (in spite of its name) */
   5.188 @@ -938,10 +958,10 @@
   5.189    CINIT(HTTPPOST, OBJECTPOINT, 24),
   5.190  
   5.191    /* name of the file keeping your private SSL-certificate */
   5.192 -  CINIT(SSLCERT, OBJECTPOINT, 25),
   5.193 +  CINIT(SSLCERT, STRINGPOINT, 25),
   5.194  
   5.195    /* password for the SSL or SSH private key */
   5.196 -  CINIT(KEYPASSWD, OBJECTPOINT, 26),
   5.197 +  CINIT(KEYPASSWD, STRINGPOINT, 26),
   5.198  
   5.199    /* send TYPE parameter? */
   5.200    CINIT(CRLF, LONG, 27),
   5.201 @@ -955,7 +975,7 @@
   5.202  
   5.203    /* point to a file to read the initial cookies from, also enables
   5.204       "cookie awareness" */
   5.205 -  CINIT(COOKIEFILE, OBJECTPOINT, 31),
   5.206 +  CINIT(COOKIEFILE, STRINGPOINT, 31),
   5.207  
   5.208    /* What version to specifically try to use.
   5.209       See CURL_SSLVERSION defines below. */
   5.210 @@ -974,9 +994,9 @@
   5.211       HTTP: DELETE, TRACE and others
   5.212       FTP: to use a different list command
   5.213       */
   5.214 -  CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
   5.215 -
   5.216 -  /* HTTP request, for odd commands like DELETE, TRACE and others */
   5.217 +  CINIT(CUSTOMREQUEST, STRINGPOINT, 36),
   5.218 +
   5.219 +  /* FILE handle to use instead of stderr */
   5.220    CINIT(STDERR, OBJECTPOINT, 37),
   5.221  
   5.222    /* 38 is not used */
   5.223 @@ -1033,19 +1053,19 @@
   5.224    CINIT(HTTPPROXYTUNNEL, LONG, 61),
   5.225  
   5.226    /* Set the interface string to use as outgoing network interface */
   5.227 -  CINIT(INTERFACE, OBJECTPOINT, 62),
   5.228 +  CINIT(INTERFACE, STRINGPOINT, 62),
   5.229  
   5.230    /* Set the krb4/5 security level, this also enables krb4/5 awareness.  This
   5.231     * is a string, 'clear', 'safe', 'confidential' or 'private'.  If the string
   5.232     * is set but doesn't match one of these, 'private' will be used.  */
   5.233 -  CINIT(KRBLEVEL, OBJECTPOINT, 63),
   5.234 +  CINIT(KRBLEVEL, STRINGPOINT, 63),
   5.235  
   5.236    /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
   5.237    CINIT(SSL_VERIFYPEER, LONG, 64),
   5.238  
   5.239    /* The CApath or CAfile used to validate the peer certificate
   5.240       this option is used only if SSL_VERIFYPEER is true */
   5.241 -  CINIT(CAINFO, OBJECTPOINT, 65),
   5.242 +  CINIT(CAINFO, STRINGPOINT, 65),
   5.243  
   5.244    /* 66 = OBSOLETE */
   5.245    /* 67 = OBSOLETE */
   5.246 @@ -1079,10 +1099,10 @@
   5.247  
   5.248    /* Set to a file name that contains random data for libcurl to use to
   5.249       seed the random engine when doing SSL connects. */
   5.250 -  CINIT(RANDOM_FILE, OBJECTPOINT, 76),
   5.251 +  CINIT(RANDOM_FILE, STRINGPOINT, 76),
   5.252  
   5.253    /* Set to the Entropy Gathering Daemon socket pathname */
   5.254 -  CINIT(EGDSOCKET, OBJECTPOINT, 77),
   5.255 +  CINIT(EGDSOCKET, STRINGPOINT, 77),
   5.256  
   5.257    /* Time-out connect operations after this amount of seconds, if connects are
   5.258       OK within this time, then fine... This only aborts the connect phase. */
   5.259 @@ -1104,10 +1124,10 @@
   5.260  
   5.261    /* Specify which file name to write all known cookies in after completed
   5.262       operation. Set file name to "-" (dash) to make it go to stdout. */
   5.263 -  CINIT(COOKIEJAR, OBJECTPOINT, 82),
   5.264 +  CINIT(COOKIEJAR, STRINGPOINT, 82),
   5.265  
   5.266    /* Specify which SSL ciphers to use */
   5.267 -  CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83),
   5.268 +  CINIT(SSL_CIPHER_LIST, STRINGPOINT, 83),
   5.269  
   5.270    /* Specify which HTTP version to use! This must be set to one of the
   5.271       CURL_HTTP_VERSION* enums set below. */
   5.272 @@ -1119,16 +1139,16 @@
   5.273    CINIT(FTP_USE_EPSV, LONG, 85),
   5.274  
   5.275    /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
   5.276 -  CINIT(SSLCERTTYPE, OBJECTPOINT, 86),
   5.277 +  CINIT(SSLCERTTYPE, STRINGPOINT, 86),
   5.278  
   5.279    /* name of the file keeping your private SSL-key */
   5.280 -  CINIT(SSLKEY, OBJECTPOINT, 87),
   5.281 +  CINIT(SSLKEY, STRINGPOINT, 87),
   5.282  
   5.283    /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
   5.284 -  CINIT(SSLKEYTYPE, OBJECTPOINT, 88),
   5.285 +  CINIT(SSLKEYTYPE, STRINGPOINT, 88),
   5.286  
   5.287    /* crypto engine for the SSL-sub system */
   5.288 -  CINIT(SSLENGINE, OBJECTPOINT, 89),
   5.289 +  CINIT(SSLENGINE, STRINGPOINT, 89),
   5.290  
   5.291    /* set the crypto engine for the SSL-sub system as default
   5.292       the param has no meaning...
   5.293 @@ -1155,7 +1175,7 @@
   5.294  
   5.295    /* The CApath directory used to validate the peer certificate
   5.296       this option is used only if SSL_VERIFYPEER is true */
   5.297 -  CINIT(CAPATH, OBJECTPOINT, 97),
   5.298 +  CINIT(CAPATH, STRINGPOINT, 97),
   5.299  
   5.300    /* Instruct libcurl to use a smaller receive buffer */
   5.301    CINIT(BUFFERSIZE, LONG, 98),
   5.302 @@ -1175,7 +1195,7 @@
   5.303    /* Set the Accept-Encoding string. Use this to tell a server you would like
   5.304       the response to be compressed. Before 7.21.6, this was known as
   5.305       CURLOPT_ENCODING */
   5.306 -  CINIT(ACCEPT_ENCODING, OBJECTPOINT, 102),
   5.307 +  CINIT(ACCEPT_ENCODING, STRINGPOINT, 102),
   5.308  
   5.309    /* Set pointer to private data */
   5.310    CINIT(PRIVATE, OBJECTPOINT, 103),
   5.311 @@ -1256,7 +1276,7 @@
   5.312       to parse (using the CURLOPT_NETRC option). If not set, libcurl will do
   5.313       a poor attempt to find the user's home directory and check for a .netrc
   5.314       file in there. */
   5.315 -  CINIT(NETRC_FILE, OBJECTPOINT, 118),
   5.316 +  CINIT(NETRC_FILE, STRINGPOINT, 118),
   5.317  
   5.318    /* Enable SSL/TLS for FTP, pick one of:
   5.319       CURLUSESSL_TRY     - try using SSL, proceed anyway otherwise
   5.320 @@ -1299,10 +1319,10 @@
   5.321  
   5.322    /* zero terminated string for pass on to the FTP server when asked for
   5.323       "account" info */
   5.324 -  CINIT(FTP_ACCOUNT, OBJECTPOINT, 134),
   5.325 -
   5.326 -  /* feed cookies into cookie engine */
   5.327 -  CINIT(COOKIELIST, OBJECTPOINT, 135),
   5.328 +  CINIT(FTP_ACCOUNT, STRINGPOINT, 134),
   5.329 +
   5.330 +  /* feed cookie into cookie engine */
   5.331 +  CINIT(COOKIELIST, STRINGPOINT, 135),
   5.332  
   5.333    /* ignore Content-Length */
   5.334    CINIT(IGNORE_CONTENT_LENGTH, LONG, 136),
   5.335 @@ -1348,7 +1368,7 @@
   5.336    CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146),
   5.337  
   5.338    /* Pointer to command string to send if USER/PASS fails. */
   5.339 -  CINIT(FTP_ALTERNATIVE_TO_USER, OBJECTPOINT, 147),
   5.340 +  CINIT(FTP_ALTERNATIVE_TO_USER, STRINGPOINT, 147),
   5.341  
   5.342    /* callback function for setting socket options */
   5.343    CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148),
   5.344 @@ -1362,8 +1382,8 @@
   5.345    CINIT(SSH_AUTH_TYPES, LONG, 151),
   5.346  
   5.347    /* Used by scp/sftp to do public/private key authentication */
   5.348 -  CINIT(SSH_PUBLIC_KEYFILE, OBJECTPOINT, 152),
   5.349 -  CINIT(SSH_PRIVATE_KEYFILE, OBJECTPOINT, 153),
   5.350 +  CINIT(SSH_PUBLIC_KEYFILE, STRINGPOINT, 152),
   5.351 +  CINIT(SSH_PRIVATE_KEYFILE, STRINGPOINT, 153),
   5.352  
   5.353    /* Send CCC (Clear Command Channel) after authentication */
   5.354    CINIT(FTP_SSL_CCC, LONG, 154),
   5.355 @@ -1387,7 +1407,7 @@
   5.356    CINIT(POSTREDIR, LONG, 161),
   5.357  
   5.358    /* used by scp/sftp to verify the host's public key */
   5.359 -  CINIT(SSH_HOST_PUBLIC_KEY_MD5, OBJECTPOINT, 162),
   5.360 +  CINIT(SSH_HOST_PUBLIC_KEY_MD5, STRINGPOINT, 162),
   5.361  
   5.362    /* Callback function for opening socket (instead of socket(2)). Optionally,
   5.363       callback is able change the address or refuse to connect returning
   5.364 @@ -1407,10 +1427,10 @@
   5.365    CINIT(SEEKDATA, OBJECTPOINT, 168),
   5.366  
   5.367    /* CRL file */
   5.368 -  CINIT(CRLFILE, OBJECTPOINT, 169),
   5.369 +  CINIT(CRLFILE, STRINGPOINT, 169),
   5.370  
   5.371    /* Issuer certificate */
   5.372 -  CINIT(ISSUERCERT, OBJECTPOINT, 170),
   5.373 +  CINIT(ISSUERCERT, STRINGPOINT, 170),
   5.374  
   5.375    /* (IPv6) Address scope */
   5.376    CINIT(ADDRESS_SCOPE, LONG, 171),
   5.377 @@ -1420,12 +1440,12 @@
   5.378    CINIT(CERTINFO, LONG, 172),
   5.379  
   5.380    /* "name" and "pwd" to use when fetching. */
   5.381 -  CINIT(USERNAME, OBJECTPOINT, 173),
   5.382 -  CINIT(PASSWORD, OBJECTPOINT, 174),
   5.383 +  CINIT(USERNAME, STRINGPOINT, 173),
   5.384 +  CINIT(PASSWORD, STRINGPOINT, 174),
   5.385  
   5.386      /* "name" and "pwd" to use with Proxy when fetching. */
   5.387 -  CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
   5.388 -  CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
   5.389 +  CINIT(PROXYUSERNAME, STRINGPOINT, 175),
   5.390 +  CINIT(PROXYPASSWORD, STRINGPOINT, 176),
   5.391  
   5.392    /* Comma separated list of hostnames defining no-proxy zones. These should
   5.393       match both hostnames directly, and hostnames within a domain. For
   5.394 @@ -1434,13 +1454,13 @@
   5.395       implementations of this, .local.com will be considered to be the same as
   5.396       local.com. A single * is the only valid wildcard, and effectively
   5.397       disables the use of proxy. */
   5.398 -  CINIT(NOPROXY, OBJECTPOINT, 177),
   5.399 +  CINIT(NOPROXY, STRINGPOINT, 177),
   5.400  
   5.401    /* block size for TFTP transfers */
   5.402    CINIT(TFTP_BLKSIZE, LONG, 178),
   5.403  
   5.404    /* Socks Service */
   5.405 -  CINIT(SOCKS5_GSSAPI_SERVICE, OBJECTPOINT, 179),
   5.406 +  CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179),
   5.407  
   5.408    /* Socks Service */
   5.409    CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
   5.410 @@ -1458,7 +1478,7 @@
   5.411    CINIT(REDIR_PROTOCOLS, LONG, 182),
   5.412  
   5.413    /* set the SSH knownhost file name to use */
   5.414 -  CINIT(SSH_KNOWNHOSTS, OBJECTPOINT, 183),
   5.415 +  CINIT(SSH_KNOWNHOSTS, STRINGPOINT, 183),
   5.416  
   5.417    /* set the SSH host key callback, must point to a curl_sshkeycallback
   5.418       function */
   5.419 @@ -1468,9 +1488,9 @@
   5.420    CINIT(SSH_KEYDATA, OBJECTPOINT, 185),
   5.421  
   5.422    /* set the SMTP mail originator */
   5.423 -  CINIT(MAIL_FROM, OBJECTPOINT, 186),
   5.424 -
   5.425 -  /* set the SMTP mail receiver(s) */
   5.426 +  CINIT(MAIL_FROM, STRINGPOINT, 186),
   5.427 +
   5.428 +  /* set the list of SMTP mail receiver(s) */
   5.429    CINIT(MAIL_RCPT, OBJECTPOINT, 187),
   5.430  
   5.431    /* FTP: send PRET before PASV */
   5.432 @@ -1480,13 +1500,13 @@
   5.433    CINIT(RTSP_REQUEST, LONG, 189),
   5.434  
   5.435    /* The RTSP session identifier */
   5.436 -  CINIT(RTSP_SESSION_ID, OBJECTPOINT, 190),
   5.437 +  CINIT(RTSP_SESSION_ID, STRINGPOINT, 190),
   5.438  
   5.439    /* The RTSP stream URI */
   5.440 -  CINIT(RTSP_STREAM_URI, OBJECTPOINT, 191),
   5.441 +  CINIT(RTSP_STREAM_URI, STRINGPOINT, 191),
   5.442  
   5.443    /* The Transport: header to use in RTSP requests */
   5.444 -  CINIT(RTSP_TRANSPORT, OBJECTPOINT, 192),
   5.445 +  CINIT(RTSP_TRANSPORT, STRINGPOINT, 192),
   5.446  
   5.447    /* Manually initialize the client RTSP CSeq for this handle */
   5.448    CINIT(RTSP_CLIENT_CSEQ, LONG, 193),
   5.449 @@ -1524,13 +1544,13 @@
   5.450    CINIT(RESOLVE, OBJECTPOINT, 203),
   5.451  
   5.452    /* Set a username for authenticated TLS */
   5.453 -  CINIT(TLSAUTH_USERNAME, OBJECTPOINT, 204),
   5.454 +  CINIT(TLSAUTH_USERNAME, STRINGPOINT, 204),
   5.455  
   5.456    /* Set a password for authenticated TLS */
   5.457 -  CINIT(TLSAUTH_PASSWORD, OBJECTPOINT, 205),
   5.458 +  CINIT(TLSAUTH_PASSWORD, STRINGPOINT, 205),
   5.459  
   5.460    /* Set authentication type for authenticated TLS */
   5.461 -  CINIT(TLSAUTH_TYPE, OBJECTPOINT, 206),
   5.462 +  CINIT(TLSAUTH_TYPE, STRINGPOINT, 206),
   5.463  
   5.464    /* Set to 1 to enable the "TE:" header in HTTP requests to ask for
   5.465       compressed transfer-encoded responses. Set to 0 to disable the use of TE:
   5.466 @@ -1553,7 +1573,7 @@
   5.467    CINIT(GSSAPI_DELEGATION, LONG, 210),
   5.468  
   5.469    /* Set the name servers to use for DNS resolution */
   5.470 -  CINIT(DNS_SERVERS, OBJECTPOINT, 211),
   5.471 +  CINIT(DNS_SERVERS, STRINGPOINT, 211),
   5.472  
   5.473    /* Time-out accept operations (currently for FTP only) after this amount
   5.474       of miliseconds. */
   5.475 @@ -1570,7 +1590,7 @@
   5.476    CINIT(SSL_OPTIONS, LONG, 216),
   5.477  
   5.478    /* Set the SMTP auth originator */
   5.479 -  CINIT(MAIL_AUTH, OBJECTPOINT, 217),
   5.480 +  CINIT(MAIL_AUTH, STRINGPOINT, 217),
   5.481  
   5.482    /* Enable/disable SASL initial response */
   5.483    CINIT(SASL_IR, LONG, 218),
   5.484 @@ -1581,23 +1601,23 @@
   5.485    CINIT(XFERINFOFUNCTION, FUNCTIONPOINT, 219),
   5.486  
   5.487    /* The XOAUTH2 bearer token */
   5.488 -  CINIT(XOAUTH2_BEARER, OBJECTPOINT, 220),
   5.489 +  CINIT(XOAUTH2_BEARER, STRINGPOINT, 220),
   5.490  
   5.491    /* Set the interface string to use as outgoing network
   5.492     * interface for DNS requests.
   5.493     * Only supported by the c-ares DNS backend */
   5.494 -  CINIT(DNS_INTERFACE, OBJECTPOINT, 221),
   5.495 +  CINIT(DNS_INTERFACE, STRINGPOINT, 221),
   5.496  
   5.497    /* Set the local IPv4 address to use for outgoing DNS requests.
   5.498     * Only supported by the c-ares DNS backend */
   5.499 -  CINIT(DNS_LOCAL_IP4, OBJECTPOINT, 222),
   5.500 +  CINIT(DNS_LOCAL_IP4, STRINGPOINT, 222),
   5.501  
   5.502    /* Set the local IPv4 address to use for outgoing DNS requests.
   5.503     * Only supported by the c-ares DNS backend */
   5.504 -  CINIT(DNS_LOCAL_IP6, OBJECTPOINT, 223),
   5.505 +  CINIT(DNS_LOCAL_IP6, STRINGPOINT, 223),
   5.506  
   5.507    /* Set authentication options directly */
   5.508 -  CINIT(LOGIN_OPTIONS, OBJECTPOINT, 224),
   5.509 +  CINIT(LOGIN_OPTIONS, STRINGPOINT, 224),
   5.510  
   5.511    /* Enable/disable TLS NPN extension (http2 over ssl might fail without) */
   5.512    CINIT(SSL_ENABLE_NPN, LONG, 225),
   5.513 @@ -1618,10 +1638,10 @@
   5.514  
   5.515    /* The public key in DER form used to validate the peer public key
   5.516       this option is used only if SSL_VERIFYPEER is true */
   5.517 -  CINIT(PINNEDPUBLICKEY, OBJECTPOINT, 230),
   5.518 +  CINIT(PINNEDPUBLICKEY, STRINGPOINT, 230),
   5.519  
   5.520    /* Path to Unix domain socket */
   5.521 -  CINIT(UNIX_SOCKET_PATH, OBJECTPOINT, 231),
   5.522 +  CINIT(UNIX_SOCKET_PATH, STRINGPOINT, 231),
   5.523  
   5.524    /* Set if we should verify the certificate status. */
   5.525    CINIT(SSL_VERIFYSTATUS, LONG, 232),
   5.526 @@ -1633,14 +1653,29 @@
   5.527    CINIT(PATH_AS_IS, LONG, 234),
   5.528  
   5.529    /* Proxy Service Name */
   5.530 -  CINIT(PROXY_SERVICE_NAME, OBJECTPOINT, 235),
   5.531 +  CINIT(PROXY_SERVICE_NAME, STRINGPOINT, 235),
   5.532  
   5.533    /* Service Name */
   5.534 -  CINIT(SERVICE_NAME, OBJECTPOINT, 236),
   5.535 +  CINIT(SERVICE_NAME, STRINGPOINT, 236),
   5.536  
   5.537    /* Wait/don't wait for pipe/mutex to clarify */
   5.538    CINIT(PIPEWAIT, LONG, 237),
   5.539  
   5.540 +  /* Set the protocol used when curl is given a URL without a protocol */
   5.541 +  CINIT(DEFAULT_PROTOCOL, STRINGPOINT, 238),
   5.542 +
   5.543 +  /* Set stream weight, 1 - 256 (default is 16) */
   5.544 +  CINIT(STREAM_WEIGHT, LONG, 239),
   5.545 +
   5.546 +  /* Set stream dependency on another CURL handle */
   5.547 +  CINIT(STREAM_DEPENDS, OBJECTPOINT, 240),
   5.548 +
   5.549 +  /* Set E-xclusive stream dependency on another CURL handle */
   5.550 +  CINIT(STREAM_DEPENDS_E, OBJECTPOINT, 241),
   5.551 +
   5.552 +  /* Do not send any tftp option requests to the server */
   5.553 +  CINIT(TFTP_NO_OPTIONS, LONG, 242),
   5.554 +
   5.555    CURLOPT_LASTENTRY /* the last unused */
   5.556  } CURLoption;
   5.557  
   5.558 @@ -1690,7 +1725,8 @@
   5.559                               for us! */
   5.560    CURL_HTTP_VERSION_1_0,  /* please use HTTP 1.0 in the request */
   5.561    CURL_HTTP_VERSION_1_1,  /* please use HTTP 1.1 in the request */
   5.562 -  CURL_HTTP_VERSION_2_0,  /* please use HTTP 2.0 in the request */
   5.563 +  CURL_HTTP_VERSION_2_0,  /* please use HTTP 2 in the request */
   5.564 +  CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */
   5.565  
   5.566    CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
   5.567  };
   5.568 @@ -1815,6 +1851,7 @@
   5.569    CFINIT(OBSOLETE2),
   5.570  
   5.571    CFINIT(STREAM),
   5.572 +  CFINIT(CONTENTLEN), /* added in 7.46.0, provide a curl_off_t length */
   5.573  
   5.574    CURLFORM_LASTENTRY /* the last unused */
   5.575  } CURLformoption;
   5.576 @@ -2069,12 +2106,13 @@
   5.577    CURLSSLBACKEND_CYASSL = 7,
   5.578    CURLSSLBACKEND_SCHANNEL = 8,
   5.579    CURLSSLBACKEND_DARWINSSL = 9,
   5.580 -  CURLSSLBACKEND_AXTLS = 10
   5.581 +  CURLSSLBACKEND_AXTLS = 10,
   5.582 +  CURLSSLBACKEND_MBEDTLS = 11
   5.583  } curl_sslbackend;
   5.584  
   5.585  /* Information about the SSL library used and the respective internal SSL
   5.586     handle, which can be used to obtain further information regarding the
   5.587 -   connection. Asked for with CURLINFO_TLS_SESSION. */
   5.588 +   connection. Asked for with CURLINFO_TLS_SSL_PTR or CURLINFO_TLS_SESSION. */
   5.589  struct curl_tlssessioninfo {
   5.590    curl_sslbackend backend;
   5.591    void *internals;
   5.592 @@ -2084,6 +2122,7 @@
   5.593  #define CURLINFO_LONG     0x200000
   5.594  #define CURLINFO_DOUBLE   0x300000
   5.595  #define CURLINFO_SLIST    0x400000
   5.596 +#define CURLINFO_SOCKET   0x500000
   5.597  #define CURLINFO_MASK     0x0fffff
   5.598  #define CURLINFO_TYPEMASK 0xf00000
   5.599  
   5.600 @@ -2132,9 +2171,11 @@
   5.601    CURLINFO_LOCAL_IP         = CURLINFO_STRING + 41,
   5.602    CURLINFO_LOCAL_PORT       = CURLINFO_LONG   + 42,
   5.603    CURLINFO_TLS_SESSION      = CURLINFO_SLIST  + 43,
   5.604 +  CURLINFO_ACTIVESOCKET     = CURLINFO_SOCKET + 44,
   5.605 +  CURLINFO_TLS_SSL_PTR      = CURLINFO_SLIST  + 45,
   5.606    /* Fill in new entries below here! */
   5.607  
   5.608 -  CURLINFO_LASTONE          = 43
   5.609 +  CURLINFO_LASTONE          = 45
   5.610  } CURLINFO;
   5.611  
   5.612  /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
   5.613 @@ -2294,6 +2335,8 @@
   5.614  #define CURL_VERSION_GSSAPI       (1<<17) /* Built against a GSS-API library */
   5.615  #define CURL_VERSION_KERBEROS5    (1<<18) /* Kerberos V5 auth is supported */
   5.616  #define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */
   5.617 +#define CURL_VERSION_PSL          (1<<20) /* Mozilla's Public Suffix List, used
   5.618 +                                             for cookie domain verification */
   5.619  
   5.620   /*
   5.621   * NAME curl_version_info()
     6.1 --- a/build-mac/curl/curlbuild.h	Wed Apr 20 14:49:57 2016 +0200
     6.2 +++ b/build-mac/curl/curlbuild.h	Wed Apr 20 15:40:00 2016 +0200
     6.3 @@ -1,12 +1,234 @@
     6.4 -#ifdef __LP64__
     6.5 +/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
     6.6 +#ifndef __CURL_CURLBUILD_H
     6.7 +#define __CURL_CURLBUILD_H
     6.8 +/***************************************************************************
     6.9 + *                                  _   _ ____  _
    6.10 + *  Project                     ___| | | |  _ \| |
    6.11 + *                             / __| | | | |_) | |
    6.12 + *                            | (__| |_| |  _ <| |___
    6.13 + *                             \___|\___/|_| \_\_____|
    6.14 + *
    6.15 + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
    6.16 + *
    6.17 + * This software is licensed as described in the file COPYING, which
    6.18 + * you should have received as part of this distribution. The terms
    6.19 + * are also available at https://curl.haxx.se/docs/copyright.html.
    6.20 + *
    6.21 + * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    6.22 + * copies of the Software, and permit persons to whom the Software is
    6.23 + * furnished to do so, under the terms of the COPYING file.
    6.24 + *
    6.25 + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
    6.26 + * KIND, either express or implied.
    6.27 + *
    6.28 + ***************************************************************************/
    6.29  
    6.30 -// 64-bit code
    6.31 -#include "curlbuild64.h"
    6.32 +/* ================================================================ */
    6.33 +/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
    6.34 +/* ================================================================ */
    6.35  
    6.36 -#else
    6.37 +/*
    6.38 + * NOTE 1:
    6.39 + * -------
    6.40 + *
    6.41 + * Nothing in this file is intended to be modified or adjusted by the
    6.42 + * curl library user nor by the curl library builder.
    6.43 + *
    6.44 + * If you think that something actually needs to be changed, adjusted
    6.45 + * or fixed in this file, then, report it on the libcurl development
    6.46 + * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
    6.47 + *
    6.48 + * This header file shall only export symbols which are 'curl' or 'CURL'
    6.49 + * prefixed, otherwise public name space would be polluted.
    6.50 + *
    6.51 + * NOTE 2:
    6.52 + * -------
    6.53 + *
    6.54 + * Right now you might be staring at file include/curl/curlbuild.h.in or
    6.55 + * at file include/curl/curlbuild.h, this is due to the following reason:
    6.56 + *
    6.57 + * On systems capable of running the configure script, the configure process
    6.58 + * will overwrite the distributed include/curl/curlbuild.h file with one that
    6.59 + * is suitable and specific to the library being configured and built, which
    6.60 + * is generated from the include/curl/curlbuild.h.in template file.
    6.61 + *
    6.62 + */
    6.63  
    6.64 -// 32-bit code
    6.65 -#include "curlbuild32.h"
    6.66 +/* ================================================================ */
    6.67 +/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
    6.68 +/* ================================================================ */
    6.69  
    6.70 +#ifdef CURL_SIZEOF_LONG
    6.71 +#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
    6.72 +   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
    6.73  #endif
    6.74  
    6.75 +#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
    6.76 +#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    6.77 +   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
    6.78 +#endif
    6.79 +
    6.80 +#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
    6.81 +#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    6.82 +   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
    6.83 +#endif
    6.84 +
    6.85 +#ifdef CURL_TYPEOF_CURL_OFF_T
    6.86 +#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
    6.87 +   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
    6.88 +#endif
    6.89 +
    6.90 +#ifdef CURL_FORMAT_CURL_OFF_T
    6.91 +#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
    6.92 +   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
    6.93 +#endif
    6.94 +
    6.95 +#ifdef CURL_FORMAT_CURL_OFF_TU
    6.96 +#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
    6.97 +   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
    6.98 +#endif
    6.99 +
   6.100 +#ifdef CURL_FORMAT_OFF_T
   6.101 +#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
   6.102 +   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
   6.103 +#endif
   6.104 +
   6.105 +#ifdef CURL_SIZEOF_CURL_OFF_T
   6.106 +#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   6.107 +   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
   6.108 +#endif
   6.109 +
   6.110 +#ifdef CURL_SUFFIX_CURL_OFF_T
   6.111 +#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
   6.112 +   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
   6.113 +#endif
   6.114 +
   6.115 +#ifdef CURL_SUFFIX_CURL_OFF_TU
   6.116 +#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
   6.117 +   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
   6.118 +#endif
   6.119 +
   6.120 +/* ================================================================ */
   6.121 +/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
   6.122 +/* ================================================================ */
   6.123 +
   6.124 +/* Configure process defines this to 1 when it finds out that system  */
   6.125 +/* header file ws2tcpip.h must be included by the external interface. */
   6.126 +/* #undef CURL_PULL_WS2TCPIP_H */
   6.127 +#ifdef CURL_PULL_WS2TCPIP_H
   6.128 +#  ifndef WIN32_LEAN_AND_MEAN
   6.129 +#    define WIN32_LEAN_AND_MEAN
   6.130 +#  endif
   6.131 +#  include <windows.h>
   6.132 +#  include <winsock2.h>
   6.133 +#  include <ws2tcpip.h>
   6.134 +#endif
   6.135 +
   6.136 +/* Configure process defines this to 1 when it finds out that system   */
   6.137 +/* header file sys/types.h must be included by the external interface. */
   6.138 +#define CURL_PULL_SYS_TYPES_H 1
   6.139 +#ifdef CURL_PULL_SYS_TYPES_H
   6.140 +#  include <sys/types.h>
   6.141 +#endif
   6.142 +
   6.143 +/* Configure process defines this to 1 when it finds out that system */
   6.144 +/* header file stdint.h must be included by the external interface.  */
   6.145 +#ifdef __LP64__
   6.146 +/* #undef CURL_PULL_STDINT_H */
   6.147 +#else
   6.148 +#define CURL_PULL_STDINT_H 1
   6.149 +#endif
   6.150 +#ifdef CURL_PULL_STDINT_H
   6.151 +#  include <stdint.h>
   6.152 +#endif
   6.153 +
   6.154 +/* Configure process defines this to 1 when it finds out that system  */
   6.155 +/* header file inttypes.h must be included by the external interface. */
   6.156 +#ifdef __LP64__
   6.157 +/* #undef CURL_PULL_INTTYPES_H */
   6.158 +#else
   6.159 +#define CURL_PULL_INTTYPES_H 1
   6.160 +#endif
   6.161 +#ifdef CURL_PULL_INTTYPES_H
   6.162 +#  include <inttypes.h>
   6.163 +#endif
   6.164 +
   6.165 +/* Configure process defines this to 1 when it finds out that system    */
   6.166 +/* header file sys/socket.h must be included by the external interface. */
   6.167 +#define CURL_PULL_SYS_SOCKET_H 1
   6.168 +#ifdef CURL_PULL_SYS_SOCKET_H
   6.169 +#  include <sys/socket.h>
   6.170 +#endif
   6.171 +
   6.172 +/* Configure process defines this to 1 when it finds out that system  */
   6.173 +/* header file sys/poll.h must be included by the external interface. */
   6.174 +/* #undef CURL_PULL_SYS_POLL_H */
   6.175 +#ifdef CURL_PULL_SYS_POLL_H
   6.176 +#  include <sys/poll.h>
   6.177 +#endif
   6.178 +
   6.179 +/* The size of `long', as computed by sizeof. */
   6.180 +#ifdef __LP64__
   6.181 +#define CURL_SIZEOF_LONG 8
   6.182 +#else
   6.183 +#define CURL_SIZEOF_LONG 4
   6.184 +#endif
   6.185 +
   6.186 +/* Integral data type used for curl_socklen_t. */
   6.187 +#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
   6.188 +
   6.189 +/* The size of `curl_socklen_t', as computed by sizeof. */
   6.190 +#define CURL_SIZEOF_CURL_SOCKLEN_T 4
   6.191 +
   6.192 +/* Data type definition of curl_socklen_t. */
   6.193 +typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
   6.194 +
   6.195 +/* Signed integral data type used for curl_off_t. */
   6.196 +#ifdef __LP64__
   6.197 +#define CURL_TYPEOF_CURL_OFF_T long
   6.198 +#else
   6.199 +#define CURL_TYPEOF_CURL_OFF_T int64_t
   6.200 +#endif
   6.201 +
   6.202 +/* Data type definition of curl_off_t. */
   6.203 +typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
   6.204 +
   6.205 +/* curl_off_t formatting string directive without "%" conversion specifier. */
   6.206 +#ifdef __LP64__
   6.207 +#define CURL_FORMAT_CURL_OFF_T "ld"
   6.208 +#else
   6.209 +#define CURL_FORMAT_CURL_OFF_T "lld"
   6.210 +#endif
   6.211 +
   6.212 +/* unsigned curl_off_t formatting string without "%" conversion specifier. */
   6.213 +#ifdef __LP64__
   6.214 +#define CURL_FORMAT_CURL_OFF_TU "lu"
   6.215 +#else
   6.216 +#define CURL_FORMAT_CURL_OFF_TU "llu"
   6.217 +#endif
   6.218 +
   6.219 +/* curl_off_t formatting string directive with "%" conversion specifier. */
   6.220 +#ifdef __LP64__
   6.221 +#define CURL_FORMAT_OFF_T "%ld"
   6.222 +#else
   6.223 +#define CURL_FORMAT_OFF_T "%lld"
   6.224 +#endif
   6.225 +
   6.226 +/* The size of `curl_off_t', as computed by sizeof. */
   6.227 +#define CURL_SIZEOF_CURL_OFF_T 8
   6.228 +
   6.229 +/* curl_off_t constant suffix. */
   6.230 +#ifdef __LP64__
   6.231 +#define CURL_SUFFIX_CURL_OFF_T L
   6.232 +#else
   6.233 +#define CURL_SUFFIX_CURL_OFF_T LL
   6.234 +#endif
   6.235 +
   6.236 +/* unsigned curl_off_t constant suffix. */
   6.237 +#ifdef __LP64__
   6.238 +#define CURL_SUFFIX_CURL_OFF_TU UL
   6.239 +#else
   6.240 +#define CURL_SUFFIX_CURL_OFF_TU ULL
   6.241 +#endif
   6.242 +
   6.243 +#endif /* __CURL_CURLBUILD_H */
     7.1 --- a/build-mac/curl/curlbuild32.h	Wed Apr 20 14:49:57 2016 +0200
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,198 +0,0 @@
     7.4 -/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
     7.5 -#ifndef __CURL_CURLBUILD_H
     7.6 -#define __CURL_CURLBUILD_H
     7.7 -/***************************************************************************
     7.8 - *                                  _   _ ____  _
     7.9 - *  Project                     ___| | | |  _ \| |
    7.10 - *                             / __| | | | |_) | |
    7.11 - *                            | (__| |_| |  _ <| |___
    7.12 - *                             \___|\___/|_| \_\_____|
    7.13 - *
    7.14 - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
    7.15 - *
    7.16 - * This software is licensed as described in the file COPYING, which
    7.17 - * you should have received as part of this distribution. The terms
    7.18 - * are also available at http://curl.haxx.se/docs/copyright.html.
    7.19 - *
    7.20 - * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    7.21 - * copies of the Software, and permit persons to whom the Software is
    7.22 - * furnished to do so, under the terms of the COPYING file.
    7.23 - *
    7.24 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
    7.25 - * KIND, either express or implied.
    7.26 - *
    7.27 - ***************************************************************************/
    7.28 -
    7.29 -/* ================================================================ */
    7.30 -/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
    7.31 -/* ================================================================ */
    7.32 -
    7.33 -/*
    7.34 - * NOTE 1:
    7.35 - * -------
    7.36 - *
    7.37 - * Nothing in this file is intended to be modified or adjusted by the
    7.38 - * curl library user nor by the curl library builder.
    7.39 - *
    7.40 - * If you think that something actually needs to be changed, adjusted
    7.41 - * or fixed in this file, then, report it on the libcurl development
    7.42 - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
    7.43 - *
    7.44 - * This header file shall only export symbols which are 'curl' or 'CURL'
    7.45 - * prefixed, otherwise public name space would be polluted.
    7.46 - *
    7.47 - * NOTE 2:
    7.48 - * -------
    7.49 - *
    7.50 - * Right now you might be staring at file include/curl/curlbuild.h.in or
    7.51 - * at file include/curl/curlbuild.h, this is due to the following reason:
    7.52 - *
    7.53 - * On systems capable of running the configure script, the configure process
    7.54 - * will overwrite the distributed include/curl/curlbuild.h file with one that
    7.55 - * is suitable and specific to the library being configured and built, which
    7.56 - * is generated from the include/curl/curlbuild.h.in template file.
    7.57 - *
    7.58 - */
    7.59 -
    7.60 -/* ================================================================ */
    7.61 -/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
    7.62 -/* ================================================================ */
    7.63 -
    7.64 -#ifdef CURL_SIZEOF_LONG
    7.65 -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
    7.66 -   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
    7.67 -#endif
    7.68 -
    7.69 -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
    7.70 -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    7.71 -   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
    7.72 -#endif
    7.73 -
    7.74 -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
    7.75 -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    7.76 -   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
    7.77 -#endif
    7.78 -
    7.79 -#ifdef CURL_TYPEOF_CURL_OFF_T
    7.80 -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
    7.81 -   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
    7.82 -#endif
    7.83 -
    7.84 -#ifdef CURL_FORMAT_CURL_OFF_T
    7.85 -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
    7.86 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
    7.87 -#endif
    7.88 -
    7.89 -#ifdef CURL_FORMAT_CURL_OFF_TU
    7.90 -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
    7.91 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
    7.92 -#endif
    7.93 -
    7.94 -#ifdef CURL_FORMAT_OFF_T
    7.95 -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
    7.96 -   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
    7.97 -#endif
    7.98 -
    7.99 -#ifdef CURL_SIZEOF_CURL_OFF_T
   7.100 -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   7.101 -   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
   7.102 -#endif
   7.103 -
   7.104 -#ifdef CURL_SUFFIX_CURL_OFF_T
   7.105 -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
   7.106 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
   7.107 -#endif
   7.108 -
   7.109 -#ifdef CURL_SUFFIX_CURL_OFF_TU
   7.110 -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
   7.111 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
   7.112 -#endif
   7.113 -
   7.114 -/* ================================================================ */
   7.115 -/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
   7.116 -/* ================================================================ */
   7.117 -
   7.118 -/* Configure process defines this to 1 when it finds out that system  */
   7.119 -/* header file ws2tcpip.h must be included by the external interface. */
   7.120 -/* #undef CURL_PULL_WS2TCPIP_H */
   7.121 -#ifdef CURL_PULL_WS2TCPIP_H
   7.122 -#  ifndef WIN32_LEAN_AND_MEAN
   7.123 -#    define WIN32_LEAN_AND_MEAN
   7.124 -#  endif
   7.125 -#  include <windows.h>
   7.126 -#  include <winsock2.h>
   7.127 -#  include <ws2tcpip.h>
   7.128 -#endif
   7.129 -
   7.130 -/* Configure process defines this to 1 when it finds out that system   */
   7.131 -/* header file sys/types.h must be included by the external interface. */
   7.132 -#define CURL_PULL_SYS_TYPES_H 1
   7.133 -#ifdef CURL_PULL_SYS_TYPES_H
   7.134 -#  include <sys/types.h>
   7.135 -#endif
   7.136 -
   7.137 -/* Configure process defines this to 1 when it finds out that system */
   7.138 -/* header file stdint.h must be included by the external interface.  */
   7.139 -#define CURL_PULL_STDINT_H 1
   7.140 -#ifdef CURL_PULL_STDINT_H
   7.141 -#  include <stdint.h>
   7.142 -#endif
   7.143 -
   7.144 -/* Configure process defines this to 1 when it finds out that system  */
   7.145 -/* header file inttypes.h must be included by the external interface. */
   7.146 -#define CURL_PULL_INTTYPES_H 1
   7.147 -#ifdef CURL_PULL_INTTYPES_H
   7.148 -#  include <inttypes.h>
   7.149 -#endif
   7.150 -
   7.151 -/* Configure process defines this to 1 when it finds out that system    */
   7.152 -/* header file sys/socket.h must be included by the external interface. */
   7.153 -#define CURL_PULL_SYS_SOCKET_H 1
   7.154 -#ifdef CURL_PULL_SYS_SOCKET_H
   7.155 -#  include <sys/socket.h>
   7.156 -#endif
   7.157 -
   7.158 -/* Configure process defines this to 1 when it finds out that system  */
   7.159 -/* header file sys/poll.h must be included by the external interface. */
   7.160 -/* #undef CURL_PULL_SYS_POLL_H */
   7.161 -#ifdef CURL_PULL_SYS_POLL_H
   7.162 -#  include <sys/poll.h>
   7.163 -#endif
   7.164 -
   7.165 -/* The size of `long', as computed by sizeof. */
   7.166 -#define CURL_SIZEOF_LONG 4
   7.167 -
   7.168 -/* Integral data type used for curl_socklen_t. */
   7.169 -#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
   7.170 -
   7.171 -/* The size of `curl_socklen_t', as computed by sizeof. */
   7.172 -#define CURL_SIZEOF_CURL_SOCKLEN_T 4
   7.173 -
   7.174 -/* Data type definition of curl_socklen_t. */
   7.175 -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
   7.176 -
   7.177 -/* Signed integral data type used for curl_off_t. */
   7.178 -#define CURL_TYPEOF_CURL_OFF_T int64_t
   7.179 -
   7.180 -/* Data type definition of curl_off_t. */
   7.181 -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
   7.182 -
   7.183 -/* curl_off_t formatting string directive without "%" conversion specifier. */
   7.184 -#define CURL_FORMAT_CURL_OFF_T "lld"
   7.185 -
   7.186 -/* unsigned curl_off_t formatting string without "%" conversion specifier. */
   7.187 -#define CURL_FORMAT_CURL_OFF_TU "llu"
   7.188 -
   7.189 -/* curl_off_t formatting string directive with "%" conversion specifier. */
   7.190 -#define CURL_FORMAT_OFF_T "%lld"
   7.191 -
   7.192 -/* The size of `curl_off_t', as computed by sizeof. */
   7.193 -#define CURL_SIZEOF_CURL_OFF_T 8
   7.194 -
   7.195 -/* curl_off_t constant suffix. */
   7.196 -#define CURL_SUFFIX_CURL_OFF_T LL
   7.197 -
   7.198 -/* unsigned curl_off_t constant suffix. */
   7.199 -#define CURL_SUFFIX_CURL_OFF_TU ULL
   7.200 -
   7.201 -#endif /* __CURL_CURLBUILD_H */
     8.1 --- a/build-mac/curl/curlbuild64.h	Wed Apr 20 14:49:57 2016 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,198 +0,0 @@
     8.4 -/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
     8.5 -#ifndef __CURL_CURLBUILD_H
     8.6 -#define __CURL_CURLBUILD_H
     8.7 -/***************************************************************************
     8.8 - *                                  _   _ ____  _
     8.9 - *  Project                     ___| | | |  _ \| |
    8.10 - *                             / __| | | | |_) | |
    8.11 - *                            | (__| |_| |  _ <| |___
    8.12 - *                             \___|\___/|_| \_\_____|
    8.13 - *
    8.14 - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
    8.15 - *
    8.16 - * This software is licensed as described in the file COPYING, which
    8.17 - * you should have received as part of this distribution. The terms
    8.18 - * are also available at http://curl.haxx.se/docs/copyright.html.
    8.19 - *
    8.20 - * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    8.21 - * copies of the Software, and permit persons to whom the Software is
    8.22 - * furnished to do so, under the terms of the COPYING file.
    8.23 - *
    8.24 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
    8.25 - * KIND, either express or implied.
    8.26 - *
    8.27 - ***************************************************************************/
    8.28 -
    8.29 -/* ================================================================ */
    8.30 -/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
    8.31 -/* ================================================================ */
    8.32 -
    8.33 -/*
    8.34 - * NOTE 1:
    8.35 - * -------
    8.36 - *
    8.37 - * Nothing in this file is intended to be modified or adjusted by the
    8.38 - * curl library user nor by the curl library builder.
    8.39 - *
    8.40 - * If you think that something actually needs to be changed, adjusted
    8.41 - * or fixed in this file, then, report it on the libcurl development
    8.42 - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
    8.43 - *
    8.44 - * This header file shall only export symbols which are 'curl' or 'CURL'
    8.45 - * prefixed, otherwise public name space would be polluted.
    8.46 - *
    8.47 - * NOTE 2:
    8.48 - * -------
    8.49 - *
    8.50 - * Right now you might be staring at file include/curl/curlbuild.h.in or
    8.51 - * at file include/curl/curlbuild.h, this is due to the following reason:
    8.52 - *
    8.53 - * On systems capable of running the configure script, the configure process
    8.54 - * will overwrite the distributed include/curl/curlbuild.h file with one that
    8.55 - * is suitable and specific to the library being configured and built, which
    8.56 - * is generated from the include/curl/curlbuild.h.in template file.
    8.57 - *
    8.58 - */
    8.59 -
    8.60 -/* ================================================================ */
    8.61 -/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
    8.62 -/* ================================================================ */
    8.63 -
    8.64 -#ifdef CURL_SIZEOF_LONG
    8.65 -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
    8.66 -   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
    8.67 -#endif
    8.68 -
    8.69 -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
    8.70 -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    8.71 -   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
    8.72 -#endif
    8.73 -
    8.74 -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
    8.75 -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    8.76 -   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
    8.77 -#endif
    8.78 -
    8.79 -#ifdef CURL_TYPEOF_CURL_OFF_T
    8.80 -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
    8.81 -   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
    8.82 -#endif
    8.83 -
    8.84 -#ifdef CURL_FORMAT_CURL_OFF_T
    8.85 -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
    8.86 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
    8.87 -#endif
    8.88 -
    8.89 -#ifdef CURL_FORMAT_CURL_OFF_TU
    8.90 -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
    8.91 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
    8.92 -#endif
    8.93 -
    8.94 -#ifdef CURL_FORMAT_OFF_T
    8.95 -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
    8.96 -   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
    8.97 -#endif
    8.98 -
    8.99 -#ifdef CURL_SIZEOF_CURL_OFF_T
   8.100 -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   8.101 -   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
   8.102 -#endif
   8.103 -
   8.104 -#ifdef CURL_SUFFIX_CURL_OFF_T
   8.105 -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
   8.106 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
   8.107 -#endif
   8.108 -
   8.109 -#ifdef CURL_SUFFIX_CURL_OFF_TU
   8.110 -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
   8.111 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
   8.112 -#endif
   8.113 -
   8.114 -/* ================================================================ */
   8.115 -/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
   8.116 -/* ================================================================ */
   8.117 -
   8.118 -/* Configure process defines this to 1 when it finds out that system  */
   8.119 -/* header file ws2tcpip.h must be included by the external interface. */
   8.120 -/* #undef CURL_PULL_WS2TCPIP_H */
   8.121 -#ifdef CURL_PULL_WS2TCPIP_H
   8.122 -#  ifndef WIN32_LEAN_AND_MEAN
   8.123 -#    define WIN32_LEAN_AND_MEAN
   8.124 -#  endif
   8.125 -#  include <windows.h>
   8.126 -#  include <winsock2.h>
   8.127 -#  include <ws2tcpip.h>
   8.128 -#endif
   8.129 -
   8.130 -/* Configure process defines this to 1 when it finds out that system   */
   8.131 -/* header file sys/types.h must be included by the external interface. */
   8.132 -#define CURL_PULL_SYS_TYPES_H 1
   8.133 -#ifdef CURL_PULL_SYS_TYPES_H
   8.134 -#  include <sys/types.h>
   8.135 -#endif
   8.136 -
   8.137 -/* Configure process defines this to 1 when it finds out that system */
   8.138 -/* header file stdint.h must be included by the external interface.  */
   8.139 -/* #undef CURL_PULL_STDINT_H */
   8.140 -#ifdef CURL_PULL_STDINT_H
   8.141 -#  include <stdint.h>
   8.142 -#endif
   8.143 -
   8.144 -/* Configure process defines this to 1 when it finds out that system  */
   8.145 -/* header file inttypes.h must be included by the external interface. */
   8.146 -/* #undef CURL_PULL_INTTYPES_H */
   8.147 -#ifdef CURL_PULL_INTTYPES_H
   8.148 -#  include <inttypes.h>
   8.149 -#endif
   8.150 -
   8.151 -/* Configure process defines this to 1 when it finds out that system    */
   8.152 -/* header file sys/socket.h must be included by the external interface. */
   8.153 -#define CURL_PULL_SYS_SOCKET_H 1
   8.154 -#ifdef CURL_PULL_SYS_SOCKET_H
   8.155 -#  include <sys/socket.h>
   8.156 -#endif
   8.157 -
   8.158 -/* Configure process defines this to 1 when it finds out that system  */
   8.159 -/* header file sys/poll.h must be included by the external interface. */
   8.160 -/* #undef CURL_PULL_SYS_POLL_H */
   8.161 -#ifdef CURL_PULL_SYS_POLL_H
   8.162 -#  include <sys/poll.h>
   8.163 -#endif
   8.164 -
   8.165 -/* The size of `long', as computed by sizeof. */
   8.166 -#define CURL_SIZEOF_LONG 8
   8.167 -
   8.168 -/* Integral data type used for curl_socklen_t. */
   8.169 -#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
   8.170 -
   8.171 -/* The size of `curl_socklen_t', as computed by sizeof. */
   8.172 -#define CURL_SIZEOF_CURL_SOCKLEN_T 4
   8.173 -
   8.174 -/* Data type definition of curl_socklen_t. */
   8.175 -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
   8.176 -
   8.177 -/* Signed integral data type used for curl_off_t. */
   8.178 -#define CURL_TYPEOF_CURL_OFF_T long
   8.179 -
   8.180 -/* Data type definition of curl_off_t. */
   8.181 -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
   8.182 -
   8.183 -/* curl_off_t formatting string directive without "%" conversion specifier. */
   8.184 -#define CURL_FORMAT_CURL_OFF_T "ld"
   8.185 -
   8.186 -/* unsigned curl_off_t formatting string without "%" conversion specifier. */
   8.187 -#define CURL_FORMAT_CURL_OFF_TU "lu"
   8.188 -
   8.189 -/* curl_off_t formatting string directive with "%" conversion specifier. */
   8.190 -#define CURL_FORMAT_OFF_T "%ld"
   8.191 -
   8.192 -/* The size of `curl_off_t', as computed by sizeof. */
   8.193 -#define CURL_SIZEOF_CURL_OFF_T 8
   8.194 -
   8.195 -/* curl_off_t constant suffix. */
   8.196 -#define CURL_SUFFIX_CURL_OFF_T L
   8.197 -
   8.198 -/* unsigned curl_off_t constant suffix. */
   8.199 -#define CURL_SUFFIX_CURL_OFF_TU UL
   8.200 -
   8.201 -#endif /* __CURL_CURLBUILD_H */
     9.1 --- a/build-mac/curl/curlbuild_.h	Wed Apr 20 14:49:57 2016 +0200
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,198 +0,0 @@
     9.4 -/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
     9.5 -#ifndef __CURL_CURLBUILD_H
     9.6 -#define __CURL_CURLBUILD_H
     9.7 -/***************************************************************************
     9.8 - *                                  _   _ ____  _
     9.9 - *  Project                     ___| | | |  _ \| |
    9.10 - *                             / __| | | | |_) | |
    9.11 - *                            | (__| |_| |  _ <| |___
    9.12 - *                             \___|\___/|_| \_\_____|
    9.13 - *
    9.14 - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
    9.15 - *
    9.16 - * This software is licensed as described in the file COPYING, which
    9.17 - * you should have received as part of this distribution. The terms
    9.18 - * are also available at http://curl.haxx.se/docs/copyright.html.
    9.19 - *
    9.20 - * You may opt to use, copy, modify, merge, publish, distribute and/or sell
    9.21 - * copies of the Software, and permit persons to whom the Software is
    9.22 - * furnished to do so, under the terms of the COPYING file.
    9.23 - *
    9.24 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
    9.25 - * KIND, either express or implied.
    9.26 - *
    9.27 - ***************************************************************************/
    9.28 -
    9.29 -/* ================================================================ */
    9.30 -/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
    9.31 -/* ================================================================ */
    9.32 -
    9.33 -/*
    9.34 - * NOTE 1:
    9.35 - * -------
    9.36 - *
    9.37 - * Nothing in this file is intended to be modified or adjusted by the
    9.38 - * curl library user nor by the curl library builder.
    9.39 - *
    9.40 - * If you think that something actually needs to be changed, adjusted
    9.41 - * or fixed in this file, then, report it on the libcurl development
    9.42 - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
    9.43 - *
    9.44 - * This header file shall only export symbols which are 'curl' or 'CURL'
    9.45 - * prefixed, otherwise public name space would be polluted.
    9.46 - *
    9.47 - * NOTE 2:
    9.48 - * -------
    9.49 - *
    9.50 - * Right now you might be staring at file include/curl/curlbuild.h.in or
    9.51 - * at file include/curl/curlbuild.h, this is due to the following reason:
    9.52 - *
    9.53 - * On systems capable of running the configure script, the configure process
    9.54 - * will overwrite the distributed include/curl/curlbuild.h file with one that
    9.55 - * is suitable and specific to the library being configured and built, which
    9.56 - * is generated from the include/curl/curlbuild.h.in template file.
    9.57 - *
    9.58 - */
    9.59 -
    9.60 -/* ================================================================ */
    9.61 -/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
    9.62 -/* ================================================================ */
    9.63 -
    9.64 -#ifdef CURL_SIZEOF_LONG
    9.65 -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
    9.66 -   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
    9.67 -#endif
    9.68 -
    9.69 -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
    9.70 -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    9.71 -   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
    9.72 -#endif
    9.73 -
    9.74 -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
    9.75 -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
    9.76 -   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
    9.77 -#endif
    9.78 -
    9.79 -#ifdef CURL_TYPEOF_CURL_OFF_T
    9.80 -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
    9.81 -   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
    9.82 -#endif
    9.83 -
    9.84 -#ifdef CURL_FORMAT_CURL_OFF_T
    9.85 -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
    9.86 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
    9.87 -#endif
    9.88 -
    9.89 -#ifdef CURL_FORMAT_CURL_OFF_TU
    9.90 -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
    9.91 -   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
    9.92 -#endif
    9.93 -
    9.94 -#ifdef CURL_FORMAT_OFF_T
    9.95 -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
    9.96 -   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
    9.97 -#endif
    9.98 -
    9.99 -#ifdef CURL_SIZEOF_CURL_OFF_T
   9.100 -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
   9.101 -   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
   9.102 -#endif
   9.103 -
   9.104 -#ifdef CURL_SUFFIX_CURL_OFF_T
   9.105 -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
   9.106 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
   9.107 -#endif
   9.108 -
   9.109 -#ifdef CURL_SUFFIX_CURL_OFF_TU
   9.110 -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
   9.111 -   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
   9.112 -#endif
   9.113 -
   9.114 -/* ================================================================ */
   9.115 -/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
   9.116 -/* ================================================================ */
   9.117 -
   9.118 -/* Configure process defines this to 1 when it finds out that system  */
   9.119 -/* header file ws2tcpip.h must be included by the external interface. */
   9.120 -/* #undef CURL_PULL_WS2TCPIP_H */
   9.121 -#ifdef CURL_PULL_WS2TCPIP_H
   9.122 -#  ifndef WIN32_LEAN_AND_MEAN
   9.123 -#    define WIN32_LEAN_AND_MEAN
   9.124 -#  endif
   9.125 -#  include <windows.h>
   9.126 -#  include <winsock2.h>
   9.127 -#  include <ws2tcpip.h>
   9.128 -#endif
   9.129 -
   9.130 -/* Configure process defines this to 1 when it finds out that system   */
   9.131 -/* header file sys/types.h must be included by the external interface. */
   9.132 -#define CURL_PULL_SYS_TYPES_H 1
   9.133 -#ifdef CURL_PULL_SYS_TYPES_H
   9.134 -#  include <sys/types.h>
   9.135 -#endif
   9.136 -
   9.137 -/* Configure process defines this to 1 when it finds out that system */
   9.138 -/* header file stdint.h must be included by the external interface.  */
   9.139 -#define CURL_PULL_STDINT_H 1
   9.140 -#ifdef CURL_PULL_STDINT_H
   9.141 -#  include <stdint.h>
   9.142 -#endif
   9.143 -
   9.144 -/* Configure process defines this to 1 when it finds out that system  */
   9.145 -/* header file inttypes.h must be included by the external interface. */
   9.146 -#define CURL_PULL_INTTYPES_H 1
   9.147 -#ifdef CURL_PULL_INTTYPES_H
   9.148 -#  include <inttypes.h>
   9.149 -#endif
   9.150 -
   9.151 -/* Configure process defines this to 1 when it finds out that system    */
   9.152 -/* header file sys/socket.h must be included by the external interface. */
   9.153 -#define CURL_PULL_SYS_SOCKET_H 1
   9.154 -#ifdef CURL_PULL_SYS_SOCKET_H
   9.155 -#  include <sys/socket.h>
   9.156 -#endif
   9.157 -
   9.158 -/* Configure process defines this to 1 when it finds out that system  */
   9.159 -/* header file sys/poll.h must be included by the external interface. */
   9.160 -/* #undef CURL_PULL_SYS_POLL_H */
   9.161 -#ifdef CURL_PULL_SYS_POLL_H
   9.162 -#  include <sys/poll.h>
   9.163 -#endif
   9.164 -
   9.165 -/* The size of `long', as computed by sizeof. */
   9.166 -#define CURL_SIZEOF_LONG 4
   9.167 -
   9.168 -/* Integral data type used for curl_socklen_t. */
   9.169 -#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
   9.170 -
   9.171 -/* The size of `curl_socklen_t', as computed by sizeof. */
   9.172 -#define CURL_SIZEOF_CURL_SOCKLEN_T 4
   9.173 -
   9.174 -/* Data type definition of curl_socklen_t. */
   9.175 -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
   9.176 -
   9.177 -/* Signed integral data type used for curl_off_t. */
   9.178 -#define CURL_TYPEOF_CURL_OFF_T int64_t
   9.179 -
   9.180 -/* Data type definition of curl_off_t. */
   9.181 -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
   9.182 -
   9.183 -/* curl_off_t formatting string directive without "%" conversion specifier. */
   9.184 -#define CURL_FORMAT_CURL_OFF_T "lld"
   9.185 -
   9.186 -/* unsigned curl_off_t formatting string without "%" conversion specifier. */
   9.187 -#define CURL_FORMAT_CURL_OFF_TU "llu"
   9.188 -
   9.189 -/* curl_off_t formatting string directive with "%" conversion specifier. */
   9.190 -#define CURL_FORMAT_OFF_T "%lld"
   9.191 -
   9.192 -/* The size of `curl_off_t', as computed by sizeof. */
   9.193 -#define CURL_SIZEOF_CURL_OFF_T 8
   9.194 -
   9.195 -/* curl_off_t constant suffix. */
   9.196 -#define CURL_SUFFIX_CURL_OFF_T LL
   9.197 -
   9.198 -/* unsigned curl_off_t constant suffix. */
   9.199 -#define CURL_SUFFIX_CURL_OFF_TU ULL
   9.200 -
   9.201 -#endif /* __CURL_CURLBUILD_H */
    10.1 --- a/build-mac/curl/curlrules.h	Wed Apr 20 14:49:57 2016 +0200
    10.2 +++ b/build-mac/curl/curlrules.h	Wed Apr 20 15:40:00 2016 +0200
    10.3 @@ -11,7 +11,7 @@
    10.4   *
    10.5   * This software is licensed as described in the file COPYING, which
    10.6   * you should have received as part of this distribution. The terms
    10.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    10.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    10.9   *
   10.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   10.11   * copies of the Software, and permit persons to whom the Software is
   10.12 @@ -47,7 +47,7 @@
   10.13   * library is properly built and used.
   10.14   *
   10.15   * You can find further help on the libcurl development mailing list:
   10.16 - * http://cool.haxx.se/mailman/listinfo/curl-library/
   10.17 + * https://cool.haxx.se/mailman/listinfo/curl-library/
   10.18   *
   10.19   * NOTE 2
   10.20   * ------
    11.1 --- a/build-mac/curl/curlver.h	Wed Apr 20 14:49:57 2016 +0200
    11.2 +++ b/build-mac/curl/curlver.h	Wed Apr 20 15:40:00 2016 +0200
    11.3 @@ -7,11 +7,11 @@
    11.4   *                            | (__| |_| |  _ <| |___
    11.5   *                             \___|\___/|_| \_\_____|
    11.6   *
    11.7 - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
    11.8 + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
    11.9   *
   11.10   * This software is licensed as described in the file COPYING, which
   11.11   * you should have received as part of this distribution. The terms
   11.12 - * are also available at http://curl.haxx.se/docs/copyright.html.
   11.13 + * are also available at https://curl.haxx.se/docs/copyright.html.
   11.14   *
   11.15   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   11.16   * copies of the Software, and permit persons to whom the Software is
   11.17 @@ -26,16 +26,16 @@
   11.18     a script at release-time. This was made its own header file in 7.11.2 */
   11.19  
   11.20  /* This is the global package copyright */
   11.21 -#define LIBCURL_COPYRIGHT "1996 - 2015 Daniel Stenberg, <daniel@haxx.se>."
   11.22 +#define LIBCURL_COPYRIGHT "1996 - 2016 Daniel Stenberg, <daniel@haxx.se>."
   11.23  
   11.24  /* This is the version number of the libcurl package from which this header
   11.25     file origins: */
   11.26 -#define LIBCURL_VERSION "7.43.0"
   11.27 +#define LIBCURL_VERSION "7.48.0"
   11.28  
   11.29  /* The numeric version number is also available "in parts" by using these
   11.30     defines: */
   11.31  #define LIBCURL_VERSION_MAJOR 7
   11.32 -#define LIBCURL_VERSION_MINOR 43
   11.33 +#define LIBCURL_VERSION_MINOR 48
   11.34  #define LIBCURL_VERSION_PATCH 0
   11.35  
   11.36  /* This is the numeric version of the libcurl version number, meant for easier
   11.37 @@ -57,7 +57,7 @@
   11.38     CURL_VERSION_BITS() macro since curl's own configure script greps for it
   11.39     and needs it to contain the full number.
   11.40  */
   11.41 -#define LIBCURL_VERSION_NUM 0x072b00
   11.42 +#define LIBCURL_VERSION_NUM 0x073000
   11.43  
   11.44  /*
   11.45   * This is the date and time when the full source package was created. The
   11.46 @@ -68,7 +68,7 @@
   11.47   *
   11.48   * "Mon Feb 12 11:35:33 UTC 2007"
   11.49   */
   11.50 -#define LIBCURL_TIMESTAMP "Wed Jun 17 05:56:00 UTC 2015"
   11.51 +#define LIBCURL_TIMESTAMP "Wed Mar 23 06:57:50 UTC 2016"
   11.52  
   11.53  #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
   11.54  #define CURL_AT_LEAST_VERSION(x,y,z) \
    12.1 --- a/build-mac/curl/easy.h	Wed Apr 20 14:49:57 2016 +0200
    12.2 +++ b/build-mac/curl/easy.h	Wed Apr 20 15:40:00 2016 +0200
    12.3 @@ -11,7 +11,7 @@
    12.4   *
    12.5   * This software is licensed as described in the file COPYING, which
    12.6   * you should have received as part of this distribution. The terms
    12.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    12.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    12.9   *
   12.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   12.11   * copies of the Software, and permit persons to whom the Software is
    13.1 --- a/build-mac/curl/mprintf.h	Wed Apr 20 14:49:57 2016 +0200
    13.2 +++ b/build-mac/curl/mprintf.h	Wed Apr 20 15:40:00 2016 +0200
    13.3 @@ -11,7 +11,7 @@
    13.4   *
    13.5   * This software is licensed as described in the file COPYING, which
    13.6   * you should have received as part of this distribution. The terms
    13.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    13.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    13.9   *
   13.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   13.11   * copies of the Software, and permit persons to whom the Software is
    14.1 --- a/build-mac/curl/multi.h	Wed Apr 20 14:49:57 2016 +0200
    14.2 +++ b/build-mac/curl/multi.h	Wed Apr 20 15:40:00 2016 +0200
    14.3 @@ -11,7 +11,7 @@
    14.4   *
    14.5   * This software is licensed as described in the file COPYING, which
    14.6   * you should have received as part of this distribution. The terms
    14.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    14.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    14.9   *
   14.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   14.11   * copies of the Software, and permit persons to whom the Software is
   14.12 @@ -370,6 +370,12 @@
   14.13    /* maximum number of open connections in total */
   14.14    CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13),
   14.15  
   14.16 +   /* This is the server push callback function pointer */
   14.17 +  CINIT(PUSHFUNCTION, FUNCTIONPOINT, 14),
   14.18 +
   14.19 +  /* This is the argument passed to the server push callback */
   14.20 +  CINIT(PUSHDATA, OBJECTPOINT, 15),
   14.21 +
   14.22    CURLMOPT_LASTENTRY /* the last unused */
   14.23  } CURLMoption;
   14.24  
   14.25 @@ -397,6 +403,31 @@
   14.26  CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
   14.27                                          curl_socket_t sockfd, void *sockp);
   14.28  
   14.29 +
   14.30 +/*
   14.31 + * Name: curl_push_callback
   14.32 + *
   14.33 + * Desc: This callback gets called when a new stream is being pushed by the
   14.34 + *       server. It approves or denies the new stream.
   14.35 + *
   14.36 + * Returns: CURL_PUSH_OK or CURL_PUSH_DENY.
   14.37 + */
   14.38 +#define CURL_PUSH_OK   0
   14.39 +#define CURL_PUSH_DENY 1
   14.40 +
   14.41 +struct curl_pushheaders;  /* forward declaration only */
   14.42 +
   14.43 +CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
   14.44 +                                        size_t num);
   14.45 +CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
   14.46 +                                         const char *name);
   14.47 +
   14.48 +typedef int (*curl_push_callback)(CURL *parent,
   14.49 +                                  CURL *easy,
   14.50 +                                  size_t num_headers,
   14.51 +                                  struct curl_pushheaders *headers,
   14.52 +                                  void *userp);
   14.53 +
   14.54  #ifdef __cplusplus
   14.55  } /* end of extern "C" */
   14.56  #endif
    15.1 --- a/build-mac/curl/stdcheaders.h	Wed Apr 20 14:49:57 2016 +0200
    15.2 +++ b/build-mac/curl/stdcheaders.h	Wed Apr 20 15:40:00 2016 +0200
    15.3 @@ -11,7 +11,7 @@
    15.4   *
    15.5   * This software is licensed as described in the file COPYING, which
    15.6   * you should have received as part of this distribution. The terms
    15.7 - * are also available at http://curl.haxx.se/docs/copyright.html.
    15.8 + * are also available at https://curl.haxx.se/docs/copyright.html.
    15.9   *
   15.10   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   15.11   * copies of the Software, and permit persons to whom the Software is
    16.1 --- a/build-mac/curl/typecheck-gcc.h	Wed Apr 20 14:49:57 2016 +0200
    16.2 +++ b/build-mac/curl/typecheck-gcc.h	Wed Apr 20 15:40:00 2016 +0200
    16.3 @@ -7,11 +7,11 @@
    16.4   *                            | (__| |_| |  _ <| |___
    16.5   *                             \___|\___/|_| \_\_____|
    16.6   *
    16.7 - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
    16.8 + * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
    16.9   *
   16.10   * This software is licensed as described in the file COPYING, which
   16.11   * you should have received as part of this distribution. The terms
   16.12 - * are also available at http://curl.haxx.se/docs/copyright.html.
   16.13 + * are also available at https://curl.haxx.se/docs/copyright.html.
   16.14   *
   16.15   * You may opt to use, copy, modify, merge, publish, distribute and/or sell
   16.16   * copies of the Software, and permit persons to whom the Software is
   16.17 @@ -218,60 +218,67 @@
   16.18  
   16.19  /* evaluates to true if option takes a char* argument */
   16.20  #define _curl_is_string_option(option)                                        \
   16.21 -  ((option) == CURLOPT_URL ||                                                 \
   16.22 -   (option) == CURLOPT_PROXY ||                                               \
   16.23 -   (option) == CURLOPT_INTERFACE ||                                           \
   16.24 -   (option) == CURLOPT_NETRC_FILE ||                                          \
   16.25 -   (option) == CURLOPT_USERPWD ||                                             \
   16.26 -   (option) == CURLOPT_USERNAME ||                                            \
   16.27 -   (option) == CURLOPT_PASSWORD ||                                            \
   16.28 -   (option) == CURLOPT_PROXYUSERPWD ||                                        \
   16.29 -   (option) == CURLOPT_PROXYUSERNAME ||                                       \
   16.30 -   (option) == CURLOPT_PROXYPASSWORD ||                                       \
   16.31 -   (option) == CURLOPT_NOPROXY ||                                             \
   16.32 -   (option) == CURLOPT_ACCEPT_ENCODING ||                                     \
   16.33 -   (option) == CURLOPT_REFERER ||                                             \
   16.34 -   (option) == CURLOPT_USERAGENT ||                                           \
   16.35 +  ((option) == CURLOPT_ACCEPT_ENCODING ||                                     \
   16.36 +   (option) == CURLOPT_CAINFO ||                                              \
   16.37 +   (option) == CURLOPT_CAPATH ||                                              \
   16.38     (option) == CURLOPT_COOKIE ||                                              \
   16.39     (option) == CURLOPT_COOKIEFILE ||                                          \
   16.40     (option) == CURLOPT_COOKIEJAR ||                                           \
   16.41     (option) == CURLOPT_COOKIELIST ||                                          \
   16.42 +   (option) == CURLOPT_CRLFILE ||                                             \
   16.43 +   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
   16.44 +   (option) == CURLOPT_DEFAULT_PROTOCOL ||                                    \
   16.45 +   (option) == CURLOPT_DNS_INTERFACE ||                                       \
   16.46 +   (option) == CURLOPT_DNS_LOCAL_IP4 ||                                       \
   16.47 +   (option) == CURLOPT_DNS_LOCAL_IP6 ||                                       \
   16.48 +   (option) == CURLOPT_DNS_SERVERS ||                                         \
   16.49 +   (option) == CURLOPT_EGDSOCKET ||                                           \
   16.50     (option) == CURLOPT_FTPPORT ||                                             \
   16.51 +   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
   16.52     (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \
   16.53 -   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
   16.54 +   (option) == CURLOPT_INTERFACE ||                                           \
   16.55 +   (option) == CURLOPT_ISSUERCERT ||                                          \
   16.56 +   (option) == CURLOPT_KEYPASSWD ||                                           \
   16.57 +   (option) == CURLOPT_KRBLEVEL ||                                            \
   16.58 +   (option) == CURLOPT_LOGIN_OPTIONS ||                                       \
   16.59 +   (option) == CURLOPT_MAIL_AUTH ||                                           \
   16.60 +   (option) == CURLOPT_MAIL_FROM ||                                           \
   16.61 +   (option) == CURLOPT_NETRC_FILE ||                                          \
   16.62 +   (option) == CURLOPT_NOPROXY ||                                             \
   16.63 +   (option) == CURLOPT_PASSWORD ||                                            \
   16.64 +   (option) == CURLOPT_PINNEDPUBLICKEY ||                                     \
   16.65 +   (option) == CURLOPT_PROXY ||                                               \
   16.66 +   (option) == CURLOPT_PROXYPASSWORD ||                                       \
   16.67 +   (option) == CURLOPT_PROXYUSERNAME ||                                       \
   16.68 +   (option) == CURLOPT_PROXYUSERPWD ||                                        \
   16.69 +   (option) == CURLOPT_PROXY_SERVICE_NAME ||                                  \
   16.70 +   (option) == CURLOPT_RANDOM_FILE ||                                         \
   16.71     (option) == CURLOPT_RANGE ||                                               \
   16.72 -   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
   16.73 -   (option) == CURLOPT_SSLCERT ||                                             \
   16.74 -   (option) == CURLOPT_SSLCERTTYPE ||                                         \
   16.75 -   (option) == CURLOPT_SSLKEY ||                                              \
   16.76 -   (option) == CURLOPT_SSLKEYTYPE ||                                          \
   16.77 -   (option) == CURLOPT_KEYPASSWD ||                                           \
   16.78 -   (option) == CURLOPT_SSLENGINE ||                                           \
   16.79 -   (option) == CURLOPT_CAINFO ||                                              \
   16.80 -   (option) == CURLOPT_CAPATH ||                                              \
   16.81 -   (option) == CURLOPT_RANDOM_FILE ||                                         \
   16.82 -   (option) == CURLOPT_EGDSOCKET ||                                           \
   16.83 -   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
   16.84 -   (option) == CURLOPT_KRBLEVEL ||                                            \
   16.85 -   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
   16.86 -   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
   16.87 -   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
   16.88 -   (option) == CURLOPT_CRLFILE ||                                             \
   16.89 -   (option) == CURLOPT_ISSUERCERT ||                                          \
   16.90 -   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
   16.91 -   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
   16.92 -   (option) == CURLOPT_MAIL_FROM ||                                           \
   16.93 +   (option) == CURLOPT_REFERER ||                                             \
   16.94     (option) == CURLOPT_RTSP_SESSION_ID ||                                     \
   16.95     (option) == CURLOPT_RTSP_STREAM_URI ||                                     \
   16.96     (option) == CURLOPT_RTSP_TRANSPORT ||                                      \
   16.97 +   (option) == CURLOPT_SERVICE_NAME ||                                        \
   16.98 +   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
   16.99 +   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
  16.100 +   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
  16.101 +   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
  16.102 +   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
  16.103 +   (option) == CURLOPT_SSLCERT ||                                             \
  16.104 +   (option) == CURLOPT_SSLCERTTYPE ||                                         \
  16.105 +   (option) == CURLOPT_SSLENGINE ||                                           \
  16.106 +   (option) == CURLOPT_SSLKEY ||                                              \
  16.107 +   (option) == CURLOPT_SSLKEYTYPE ||                                          \
  16.108 +   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
  16.109 +   (option) == CURLOPT_TLSAUTH_PASSWORD ||                                    \
  16.110 +   (option) == CURLOPT_TLSAUTH_TYPE ||                                        \
  16.111 +   (option) == CURLOPT_TLSAUTH_USERNAME ||                                    \
  16.112 +   (option) == CURLOPT_UNIX_SOCKET_PATH ||                                    \
  16.113 +   (option) == CURLOPT_URL ||                                                 \
  16.114 +   (option) == CURLOPT_USERAGENT ||                                           \
  16.115 +   (option) == CURLOPT_USERNAME ||                                            \
  16.116 +   (option) == CURLOPT_USERPWD ||                                             \
  16.117     (option) == CURLOPT_XOAUTH2_BEARER ||                                      \
  16.118 -   (option) == CURLOPT_DNS_SERVERS ||                                         \
  16.119 -   (option) == CURLOPT_DNS_INTERFACE ||                                       \
  16.120 -   (option) == CURLOPT_DNS_LOCAL_IP4 ||                                       \
  16.121 -   (option) == CURLOPT_DNS_LOCAL_IP6 ||                                       \
  16.122 -   (option) == CURLOPT_LOGIN_OPTIONS ||                                       \
  16.123 -   (option) == CURLOPT_PROXY_SERVICE_NAME ||                                  \
  16.124 -   (option) == CURLOPT_SERVICE_NAME ||                                        \
  16.125     0)
  16.126  
  16.127  /* evaluates to true if option takes a curl_write_callback argument */
  16.128 @@ -287,21 +294,22 @@
  16.129  
  16.130  /* evaluates to true if option takes a data argument to pass to a callback */
  16.131  #define _curl_is_cb_data_option(option)                                       \
  16.132 -  ((option) == CURLOPT_WRITEDATA ||                                           \
  16.133 +  ((option) == CURLOPT_CHUNK_DATA ||                                          \
  16.134 +   (option) == CURLOPT_CLOSESOCKETDATA ||                                     \
  16.135 +   (option) == CURLOPT_DEBUGDATA ||                                           \
  16.136 +   (option) == CURLOPT_FNMATCH_DATA ||                                        \
  16.137 +   (option) == CURLOPT_HEADERDATA ||                                          \
  16.138 +   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
  16.139 +   (option) == CURLOPT_IOCTLDATA ||                                           \
  16.140 +   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
  16.141 +   (option) == CURLOPT_PRIVATE ||                                             \
  16.142 +   (option) == CURLOPT_PROGRESSDATA ||                                        \
  16.143     (option) == CURLOPT_READDATA ||                                            \
  16.144 -   (option) == CURLOPT_IOCTLDATA ||                                           \
  16.145 +   (option) == CURLOPT_SEEKDATA ||                                            \
  16.146     (option) == CURLOPT_SOCKOPTDATA ||                                         \
  16.147 -   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
  16.148 -   (option) == CURLOPT_PROGRESSDATA ||                                        \
  16.149 -   (option) == CURLOPT_HEADERDATA ||                                         \
  16.150 -   (option) == CURLOPT_DEBUGDATA ||                                           \
  16.151 +   (option) == CURLOPT_SSH_KEYDATA ||                                         \
  16.152     (option) == CURLOPT_SSL_CTX_DATA ||                                        \
  16.153 -   (option) == CURLOPT_SEEKDATA ||                                            \
  16.154 -   (option) == CURLOPT_PRIVATE ||                                             \
  16.155 -   (option) == CURLOPT_SSH_KEYDATA ||                                         \
  16.156 -   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
  16.157 -   (option) == CURLOPT_CHUNK_DATA ||                                          \
  16.158 -   (option) == CURLOPT_FNMATCH_DATA ||                                        \
  16.159 +   (option) == CURLOPT_WRITEDATA ||                                           \
  16.160     0)
  16.161  
  16.162  /* evaluates to true if option takes a POST data argument (void* or char*) */
  16.163 @@ -312,13 +320,15 @@
  16.164  
  16.165  /* evaluates to true if option takes a struct curl_slist * argument */
  16.166  #define _curl_is_slist_option(option)                                         \
  16.167 -  ((option) == CURLOPT_HTTPHEADER ||                                          \
  16.168 -   (option) == CURLOPT_HTTP200ALIASES ||                                      \
  16.169 -   (option) == CURLOPT_QUOTE ||                                               \
  16.170 +  ((option) == CURLOPT_HTTP200ALIASES ||                                      \
  16.171 +   (option) == CURLOPT_HTTPHEADER ||                                          \
  16.172 +   (option) == CURLOPT_MAIL_RCPT ||                                           \
  16.173     (option) == CURLOPT_POSTQUOTE ||                                           \
  16.174     (option) == CURLOPT_PREQUOTE ||                                            \
  16.175 +   (option) == CURLOPT_PROXYHEADER ||                                         \
  16.176 +   (option) == CURLOPT_QUOTE ||                                               \
  16.177 +   (option) == CURLOPT_RESOLVE ||                                             \
  16.178     (option) == CURLOPT_TELNETOPTIONS ||                                       \
  16.179 -   (option) == CURLOPT_MAIL_RCPT ||                                           \
  16.180     0)
  16.181  
  16.182  /* groups of curl_easy_getinfo infos that take the same type of argument */
    17.1 Binary file build-mac/libcurl.a has changed
    18.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Apr 20 14:49:57 2016 +0200
    18.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Apr 20 15:40:00 2016 +0200
    18.3 @@ -97,7 +97,6 @@
    18.4  		64796A3F1B455AA5004B1C24 /* libpEpEngine.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpEngine.a; sourceTree = BUILT_PRODUCTS_DIR; };
    18.5  		64951A1B1BE0FCD800B10E71 /* system.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = system.db; path = ../db/system.db; sourceTree = "<group>"; };
    18.6  		649DE08A1B45C19100912F72 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcurl.a; sourceTree = "<group>"; };
    18.7 -		649DE08C1B45D3B700912F72 /* build-libcurl-ios.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "build-libcurl-ios.sh"; sourceTree = "<group>"; };
    18.8  		64A8264C1B455D0800EECAF0 /* bloblist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bloblist.c; path = ../src/bloblist.c; sourceTree = "<group>"; };
    18.9  		64A8264D1B455D0800EECAF0 /* bloblist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bloblist.h; path = ../src/bloblist.h; sourceTree = "<group>"; };
   18.10  		64A8264E1B455D0800EECAF0 /* cryptotech.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cryptotech.c; path = ../src/cryptotech.c; sourceTree = "<group>"; };
   18.11 @@ -197,7 +196,6 @@
   18.12  				64951A1B1BE0FCD800B10E71 /* system.db */,
   18.13  				64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */,
   18.14  				64DA240C1B832EA0000BEE80 /* netpgp.xcodeproj */,
   18.15 -				649DE08C1B45D3B700912F72 /* build-libcurl-ios.sh */,
   18.16  				649DE08A1B45C19100912F72 /* libcurl.a */,
   18.17  				64A8264B1B455C5600EECAF0 /* srcref */,
   18.18  				644297C01BE11C65002BC73B /* pEpTrustWords */,