Skip to content

Commit 5581118

Browse files
committed
update curl,png,openssl,freetype and chipmunk
1 parent fe0a775 commit 5581118

106 files changed

Lines changed: 2099 additions & 1445 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
48.6 KB
Binary file not shown.
44 KB
Binary file not shown.
576 KB
Binary file not shown.

curl/include/win32/curl/curl.h

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,8 @@ typedef enum {
805805
#define CURLPROTO_RTMPS (1<<23)
806806
#define CURLPROTO_RTMPTS (1<<24)
807807
#define CURLPROTO_GOPHER (1<<25)
808+
#define CURLPROTO_SMB (1<<26)
809+
#define CURLPROTO_SMBS (1<<27)
808810
#define CURLPROTO_ALL (~0) /* enable everything */
809811

810812
/* long may be 32 or 64 bits, but we should never depend on anything else
@@ -987,7 +989,7 @@ typedef enum {
987989
CINIT(HEADER, LONG, 42), /* throw the header out too */
988990
CINIT(NOPROGRESS, LONG, 43), /* shut off the progress meter */
989991
CINIT(NOBODY, LONG, 44), /* use HEAD to get http document */
990-
CINIT(FAILONERROR, LONG, 45), /* no output on http error codes >= 300 */
992+
CINIT(FAILONERROR, LONG, 45), /* no output on http error codes >= 400 */
991993
CINIT(UPLOAD, LONG, 46), /* this is an upload */
992994
CINIT(POST, LONG, 47), /* HTTP POST method */
993995
CINIT(DIRLISTONLY, LONG, 48), /* bare names when listing directories */
@@ -1617,6 +1619,9 @@ typedef enum {
16171619
this option is used only if SSL_VERIFYPEER is true */
16181620
CINIT(PINNEDPUBLICKEY, OBJECTPOINT, 230),
16191621

1622+
/* Path to Unix domain socket */
1623+
CINIT(UNIX_SOCKET_PATH, OBJECTPOINT, 231),
1624+
16201625
CURLOPT_LASTENTRY /* the last unused */
16211626
} CURLoption;
16221627

@@ -1653,8 +1658,8 @@ typedef enum {
16531658
option might be handy to force libcurl to use a specific IP version. */
16541659
#define CURL_IPRESOLVE_WHATEVER 0 /* default, resolves addresses to all IP
16551660
versions that your system allows */
1656-
#define CURL_IPRESOLVE_V4 1 /* resolve to ipv4 addresses */
1657-
#define CURL_IPRESOLVE_V6 2 /* resolve to ipv6 addresses */
1661+
#define CURL_IPRESOLVE_V4 1 /* resolve to IPv4 addresses */
1662+
#define CURL_IPRESOLVE_V6 2 /* resolve to IPv6 addresses */
16581663

16591664
/* three convenient "aliases" that follow the name scheme better */
16601665
#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER
@@ -2241,26 +2246,30 @@ typedef struct {
22412246

22422247
} curl_version_info_data;
22432248

2244-
#define CURL_VERSION_IPV6 (1<<0) /* IPv6-enabled */
2245-
#define CURL_VERSION_KERBEROS4 (1<<1) /* Kerberos V4 auth is supported
2246-
(deprecated) */
2247-
#define CURL_VERSION_SSL (1<<2) /* SSL options are present */
2248-
#define CURL_VERSION_LIBZ (1<<3) /* libz features are present */
2249-
#define CURL_VERSION_NTLM (1<<4) /* NTLM auth is supported */
2250-
#define CURL_VERSION_GSSNEGOTIATE (1<<5) /* Negotiate auth support
2251-
(deprecated) */
2252-
#define CURL_VERSION_DEBUG (1<<6) /* built with debug capabilities */
2253-
#define CURL_VERSION_ASYNCHDNS (1<<7) /* asynchronous dns resolves */
2254-
#define CURL_VERSION_SPNEGO (1<<8) /* SPNEGO auth is supported */
2255-
#define CURL_VERSION_LARGEFILE (1<<9) /* supports files bigger than 2GB */
2256-
#define CURL_VERSION_IDN (1<<10) /* International Domain Names support */
2257-
#define CURL_VERSION_SSPI (1<<11) /* SSPI is supported */
2258-
#define CURL_VERSION_CONV (1<<12) /* character conversions supported */
2259-
#define CURL_VERSION_CURLDEBUG (1<<13) /* debug memory tracking supported */
2260-
#define CURL_VERSION_TLSAUTH_SRP (1<<14) /* TLS-SRP auth is supported */
2261-
#define CURL_VERSION_NTLM_WB (1<<15) /* NTLM delegating to winbind helper */
2262-
#define CURL_VERSION_HTTP2 (1<<16) /* HTTP2 support built-in */
2263-
#define CURL_VERSION_GSSAPI (1<<17) /* GSS-API is supported */
2249+
#define CURL_VERSION_IPV6 (1<<0) /* IPv6-enabled */
2250+
#define CURL_VERSION_KERBEROS4 (1<<1) /* Kerberos V4 auth is supported
2251+
(deprecated) */
2252+
#define CURL_VERSION_SSL (1<<2) /* SSL options are present */
2253+
#define CURL_VERSION_LIBZ (1<<3) /* libz features are present */
2254+
#define CURL_VERSION_NTLM (1<<4) /* NTLM auth is supported */
2255+
#define CURL_VERSION_GSSNEGOTIATE (1<<5) /* Negotiate auth is supported
2256+
(deprecated) */
2257+
#define CURL_VERSION_DEBUG (1<<6) /* Built with debug capabilities */
2258+
#define CURL_VERSION_ASYNCHDNS (1<<7) /* Asynchronous DNS resolves */
2259+
#define CURL_VERSION_SPNEGO (1<<8) /* SPNEGO auth is supported */
2260+
#define CURL_VERSION_LARGEFILE (1<<9) /* Supports files larger than 2GB */
2261+
#define CURL_VERSION_IDN (1<<10) /* Internationized Domain Names are
2262+
supported */
2263+
#define CURL_VERSION_SSPI (1<<11) /* Built against Windows SSPI */
2264+
#define CURL_VERSION_CONV (1<<12) /* Character conversions supported */
2265+
#define CURL_VERSION_CURLDEBUG (1<<13) /* Debug memory tracking supported */
2266+
#define CURL_VERSION_TLSAUTH_SRP (1<<14) /* TLS-SRP auth is supported */
2267+
#define CURL_VERSION_NTLM_WB (1<<15) /* NTLM delegation to winbind helper
2268+
is suported */
2269+
#define CURL_VERSION_HTTP2 (1<<16) /* HTTP2 support built-in */
2270+
#define CURL_VERSION_GSSAPI (1<<17) /* Built against a GSS-API library */
2271+
#define CURL_VERSION_KERBEROS5 (1<<18) /* Kerberos V5 auth is supported */
2272+
#define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */
22642273

22652274
/*
22662275
* NAME curl_version_info()

curl/include/win32/curl/curlver.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -26,16 +26,16 @@
2626
a script at release-time. This was made its own header file in 7.11.2 */
2727

2828
/* This is the global package copyright */
29-
#define LIBCURL_COPYRIGHT "1996 - 2014 Daniel Stenberg, <daniel@haxx.se>."
29+
#define LIBCURL_COPYRIGHT "1996 - 2015 Daniel Stenberg, <daniel@haxx.se>."
3030

3131
/* This is the version number of the libcurl package from which this header
3232
file origins: */
33-
#define LIBCURL_VERSION "7.39.0"
33+
#define LIBCURL_VERSION "7.40.0"
3434

3535
/* The numeric version number is also available "in parts" by using these
3636
defines: */
3737
#define LIBCURL_VERSION_MAJOR 7
38-
#define LIBCURL_VERSION_MINOR 39
38+
#define LIBCURL_VERSION_MINOR 40
3939
#define LIBCURL_VERSION_PATCH 0
4040

4141
/* This is the numeric version of the libcurl version number, meant for easier
@@ -53,7 +53,7 @@
5353
and it is always a greater number in a more recent release. It makes
5454
comparisons with greater than and less than work.
5555
*/
56-
#define LIBCURL_VERSION_NUM 0x072700
56+
#define LIBCURL_VERSION_NUM 0x072800
5757

5858
/*
5959
* This is the date and time when the full source package was created. The
@@ -64,6 +64,6 @@
6464
*
6565
* "Mon Feb 12 11:35:33 UTC 2007"
6666
*/
67-
#define LIBCURL_TIMESTAMP "Wed Nov 5 07:24:58 UTC 2014"
67+
#define LIBCURL_TIMESTAMP "Thu Jan 8 08:17:17 UTC 2015"
6868

6969
#endif /* __CURL_CURLVER_H */

curl/prebuilt/win32/libcurl.dll

931 KB
Binary file not shown.
0 Bytes
Binary file not shown.

curl/prebuilt/win32/libeay32.dll

-1.13 MB
Binary file not shown.

curl/prebuilt/win32/libeay32.lib

13.4 MB
Binary file not shown.

curl/prebuilt/win32/ssleay32.dll

-268 KB
Binary file not shown.

0 commit comments

Comments
 (0)