[iortcw] 78/95: All: Update internal curl to 7.49.1
Simon McVittie
smcv at debian.org
Fri Sep 8 10:42:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to tag 1.51
in repository iortcw.
commit e6965d5d7525a125b5a0733c3f42fb0a2e2a9d67
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date: Thu Jun 1 15:51:18 2017 -0400
All: Update internal curl to 7.49.1
---
MP/code/client/cl_curl.h | 2 +-
.../{curl-7.46.0 => curl-7.49.1}/include/README | 0
.../code/curl-7.49.1}/include/curl/curl.h | 52 ++++++++++++++++-----
.../code/curl-7.49.1}/include/curl/curlbuild.h | 14 +++---
.../include/curl/curlrules.h | 4 +-
.../code/curl-7.49.1}/include/curl/curlver.h | 16 +++----
.../code/curl-7.49.1}/include/curl/easy.h | 2 +-
.../include/curl/mprintf.h | 30 ++----------
.../include/curl/multi.h | 2 +-
.../include/curl/stdcheaders.h | 2 +-
.../include/curl/typecheck-gcc.h | 2 +-
MP/code/libs/win32/libcurl.a | Bin 384706 -> 407574 bytes
MP/code/libs/win64/libcurl.a | Bin 446834 -> 475984 bytes
SP/code/client/cl_curl.h | 2 +-
.../{curl-7.46.0 => curl-7.49.1}/include/README | 0
.../code/curl-7.49.1}/include/curl/curl.h | 52 ++++++++++++++++-----
.../code/curl-7.49.1}/include/curl/curlbuild.h | 14 +++---
.../include/curl/curlrules.h | 4 +-
.../code/curl-7.49.1}/include/curl/curlver.h | 16 +++----
.../code/curl-7.49.1}/include/curl/easy.h | 2 +-
.../include/curl/mprintf.h | 30 ++----------
.../include/curl/multi.h | 2 +-
.../include/curl/stdcheaders.h | 2 +-
.../include/curl/typecheck-gcc.h | 2 +-
SP/code/libs/win32/libcurl.a | Bin 384706 -> 407574 bytes
SP/code/libs/win64/libcurl.a | Bin 446834 -> 475984 bytes
26 files changed, 130 insertions(+), 122 deletions(-)
diff --git a/MP/code/client/cl_curl.h b/MP/code/client/cl_curl.h
index 3ab8535..6fc9265 100644
--- a/MP/code/client/cl_curl.h
+++ b/MP/code/client/cl_curl.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/qcommon.h"
#ifdef USE_LOCAL_HEADERS
- #include "../curl-7.46.0/include/curl/curl.h"
+ #include "../curl-7.49.1/include/curl/curl.h"
#else
#include <curl/curl.h>
#endif
diff --git a/MP/code/curl-7.46.0/include/README b/MP/code/curl-7.49.1/include/README
similarity index 100%
rename from MP/code/curl-7.46.0/include/README
rename to MP/code/curl-7.49.1/include/README
diff --git a/SP/code/curl-7.46.0/include/curl/curl.h b/MP/code/curl-7.49.1/include/curl/curl.h
similarity index 97%
rename from SP/code/curl-7.46.0/include/curl/curl.h
rename to MP/code/curl-7.49.1/include/curl/curl.h
index 45c5063..57e716b 100644
--- a/SP/code/curl-7.46.0/include/curl/curl.h
+++ b/MP/code/curl-7.49.1/include/curl/curl.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -24,10 +24,10 @@
/*
* If you have libcurl problems, all docs and details are found here:
- * http://curl.haxx.se/libcurl/
+ * https://curl.haxx.se/libcurl/
*
* curl-library mailing list subscription and unsubscription web interface:
- * http://cool.haxx.se/mailman/listinfo/curl-library/
+ * https://cool.haxx.se/mailman/listinfo/curl-library/
*/
#include "curlver.h" /* libcurl version defines */
@@ -56,7 +56,8 @@
#include <time.h>
#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
-#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || defined(__LWIP_OPT_H__))
+#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
+ defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
/* The check above prevents the winsock2 inclusion if winsock.h already was
included, since they can't co-exist without problems */
#include <winsock2.h>
@@ -112,7 +113,7 @@ typedef void CURL;
#ifndef curl_socket_typedef
/* socket typedef */
-#if defined(WIN32) && !defined(__LWIP_OPT_H__)
+#if defined(WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)
typedef SOCKET curl_socket_t;
#define CURL_SOCKET_BAD INVALID_SOCKET
#else
@@ -372,6 +373,7 @@ typedef curlioerr (*curl_ioctl_callback)(CURL *handle,
int cmd,
void *clientp);
+#ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS
/*
* The following typedef's are signatures of malloc, free, realloc, strdup and
* calloc respectively. Function pointers of these types can be passed to the
@@ -384,6 +386,9 @@ typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
typedef char *(*curl_strdup_callback)(const char *str);
typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
+#define CURL_DID_MEMORY_FUNC_TYPEDEFS
+#endif
+
/* the kind of data that is passed to information_callback*/
typedef enum {
CURLINFO_TEXT = 0,
@@ -470,9 +475,9 @@ typedef enum {
CURLE_OBSOLETE44, /* 44 - NOT USED */
CURLE_INTERFACE_FAILED, /* 45 - CURLOPT_INTERFACE failed */
CURLE_OBSOLETE46, /* 46 - NOT USED */
- CURLE_TOO_MANY_REDIRECTS , /* 47 - catch endless re-direct loops */
+ CURLE_TOO_MANY_REDIRECTS, /* 47 - catch endless re-direct loops */
CURLE_UNKNOWN_OPTION, /* 48 - User specified an unknown option */
- CURLE_TELNET_OPTION_SYNTAX , /* 49 - Malformed telnet option */
+ CURLE_TELNET_OPTION_SYNTAX, /* 49 - Malformed telnet option */
CURLE_OBSOLETE50, /* 50 - NOT USED */
CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint
wasn't verified fine */
@@ -534,6 +539,8 @@ typedef enum {
CURLE_SSL_PINNEDPUBKEYNOTMATCH, /* 90 - specified pinned public key did not
match */
CURLE_SSL_INVALIDCERTSTATUS, /* 91 - invalid certificate status */
+ CURLE_HTTP2_STREAM, /* 92 - stream error in HTTP/2 framing layer
+ */
CURL_LAST /* never use! */
} CURLcode;
@@ -1459,7 +1466,7 @@ typedef enum {
CINIT(TFTP_BLKSIZE, LONG, 178),
/* Socks Service */
- CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179),
+ CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179), /* DEPRECATED, do not use! */
/* Socks Service */
CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
@@ -1672,6 +1679,16 @@ typedef enum {
/* Set E-xclusive stream dependency on another CURL handle */
CINIT(STREAM_DEPENDS_E, OBJECTPOINT, 241),
+ /* Do not send any tftp option requests to the server */
+ CINIT(TFTP_NO_OPTIONS, LONG, 242),
+
+ /* Linked-list of host:port:connect-to-host:connect-to-port,
+ overrides the URL's host:port (only for the network layer) */
+ CINIT(CONNECT_TO, OBJECTPOINT, 243),
+
+ /* Set TCP Fast Open */
+ CINIT(TCP_FASTOPEN, LONG, 244),
+
CURLOPT_LASTENTRY /* the last unused */
} CURLoption;
@@ -1721,7 +1738,10 @@ enum {
for us! */
CURL_HTTP_VERSION_1_0, /* please use HTTP 1.0 in the request */
CURL_HTTP_VERSION_1_1, /* please use HTTP 1.1 in the request */
- CURL_HTTP_VERSION_2_0, /* please use HTTP 2.0 in the request */
+ CURL_HTTP_VERSION_2_0, /* please use HTTP 2 in the request */
+ CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */
+ CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, /* please use HTTP 2 without HTTP/1.1
+ Upgrade */
CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
};
@@ -2105,9 +2125,14 @@ typedef enum {
CURLSSLBACKEND_MBEDTLS = 11
} curl_sslbackend;
+/* aliases for library clones and renames */
+#define CURLSSLBACKEND_LIBRESSL 1
+#define CURLSSLBACKEND_BORINGSSL 1
+#define CURLSSLBACKEND_WOLFSSL 6
+
/* Information about the SSL library used and the respective internal SSL
handle, which can be used to obtain further information regarding the
- connection. Asked for with CURLINFO_TLS_SESSION. */
+ connection. Asked for with CURLINFO_TLS_SSL_PTR or CURLINFO_TLS_SESSION. */
struct curl_tlssessioninfo {
curl_sslbackend backend;
void *internals;
@@ -2167,9 +2192,10 @@ typedef enum {
CURLINFO_LOCAL_PORT = CURLINFO_LONG + 42,
CURLINFO_TLS_SESSION = CURLINFO_SLIST + 43,
CURLINFO_ACTIVESOCKET = CURLINFO_SOCKET + 44,
+ CURLINFO_TLS_SSL_PTR = CURLINFO_SLIST + 45,
/* Fill in new entries below here! */
- CURLINFO_LASTONE = 44
+ CURLINFO_LASTONE = 45
} CURLINFO;
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
@@ -2329,6 +2355,8 @@ typedef struct {
#define CURL_VERSION_GSSAPI (1<<17) /* Built against a GSS-API library */
#define CURL_VERSION_KERBEROS5 (1<<18) /* Kerberos V5 auth is supported */
#define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */
+#define CURL_VERSION_PSL (1<<20) /* Mozilla's Public Suffix List, used
+ for cookie domain verification */
/*
* NAME curl_version_info()
diff --git a/SP/code/curl-7.46.0/include/curl/curlbuild.h b/MP/code/curl-7.49.1/include/curl/curlbuild.h
similarity index 98%
rename from SP/code/curl-7.46.0/include/curl/curlbuild.h
rename to MP/code/curl-7.49.1/include/curl/curlbuild.h
index 941711a..ae95095 100644
--- a/SP/code/curl-7.46.0/include/curl/curlbuild.h
+++ b/MP/code/curl-7.49.1/include/curl/curlbuild.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -49,7 +49,7 @@
*
* If you think that something actually needs to be changed, adjusted
* or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
+ * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
*
* Try to keep one section per platform, compiler and architecture,
* otherwise, if an existing section is reused for a different one and
@@ -527,9 +527,9 @@
/* ===================================== */
#elif defined(__GNUC__)
-# if defined(__ILP32__) || \
- defined(__i386__) || defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || \
- defined(__sparc__) || defined(__mips__) || defined(__sh__)
+# if !defined(__LP64__) && (defined(__ILP32__) || \
+ defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
+ defined(__sparc__) || defined(__mips__) || defined(__sh__))
# define CURL_SIZEOF_LONG 4
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
@@ -539,7 +539,7 @@
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
# elif defined(__LP64__) || \
- defined(__x86_64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__sparc64__)
+ defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
# define CURL_SIZEOF_LONG 8
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
diff --git a/MP/code/curl-7.46.0/include/curl/curlrules.h b/MP/code/curl-7.49.1/include/curl/curlrules.h
similarity index 98%
rename from MP/code/curl-7.46.0/include/curl/curlrules.h
rename to MP/code/curl-7.49.1/include/curl/curlrules.h
index 7c2ede3..55d21f6 100644
--- a/MP/code/curl-7.46.0/include/curl/curlrules.h
+++ b/MP/code/curl-7.49.1/include/curl/curlrules.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -47,7 +47,7 @@
* library is properly built and used.
*
* You can find further help on the libcurl development mailing list:
- * http://cool.haxx.se/mailman/listinfo/curl-library/
+ * https://cool.haxx.se/mailman/listinfo/curl-library/
*
* NOTE 2
* ------
diff --git a/SP/code/curl-7.46.0/include/curl/curlver.h b/MP/code/curl-7.49.1/include/curl/curlver.h
similarity index 87%
rename from SP/code/curl-7.46.0/include/curl/curlver.h
rename to MP/code/curl-7.49.1/include/curl/curlver.h
index af8b178..4e0bc22 100644
--- a/SP/code/curl-7.46.0/include/curl/curlver.h
+++ b/MP/code/curl-7.49.1/include/curl/curlver.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -26,17 +26,17 @@
a script at release-time. This was made its own header file in 7.11.2 */
/* This is the global package copyright */
-#define LIBCURL_COPYRIGHT "1996 - 2015 Daniel Stenberg, <daniel at haxx.se>."
+#define LIBCURL_COPYRIGHT "1996 - 2016 Daniel Stenberg, <daniel at haxx.se>."
/* This is the version number of the libcurl package from which this header
file origins: */
-#define LIBCURL_VERSION "7.46.0"
+#define LIBCURL_VERSION "7.49.1"
/* The numeric version number is also available "in parts" by using these
defines: */
#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 46
-#define LIBCURL_VERSION_PATCH 0
+#define LIBCURL_VERSION_MINOR 49
+#define LIBCURL_VERSION_PATCH 1
/* This is the numeric version of the libcurl version number, meant for easier
parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -57,7 +57,7 @@
CURL_VERSION_BITS() macro since curl's own configure script greps for it
and needs it to contain the full number.
*/
-#define LIBCURL_VERSION_NUM 0x072e00
+#define LIBCURL_VERSION_NUM 0x073101
/*
* This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
*
* "Mon Feb 12 11:35:33 UTC 2007"
*/
-#define LIBCURL_TIMESTAMP "ons 2 dec 2015 07:02:16 UTC"
+#define LIBCURL_TIMESTAMP "Mon May 30 06:15:46 UTC 2016"
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
#define CURL_AT_LEAST_VERSION(x,y,z) \
diff --git a/SP/code/curl-7.46.0/include/curl/easy.h b/MP/code/curl-7.49.1/include/curl/easy.h
similarity index 98%
rename from SP/code/curl-7.46.0/include/curl/easy.h
rename to MP/code/curl-7.49.1/include/curl/easy.h
index c1e3e76..afc766c 100644
--- a/SP/code/curl-7.46.0/include/curl/easy.h
+++ b/MP/code/curl-7.49.1/include/curl/easy.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/MP/code/curl-7.46.0/include/curl/mprintf.h b/MP/code/curl-7.49.1/include/curl/mprintf.h
similarity index 74%
rename from MP/code/curl-7.46.0/include/curl/mprintf.h
rename to MP/code/curl-7.49.1/include/curl/mprintf.h
index c6b0d76..e20f546 100644
--- a/MP/code/curl-7.46.0/include/curl/mprintf.h
+++ b/MP/code/curl-7.49.1/include/curl/mprintf.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -24,8 +24,7 @@
#include <stdarg.h>
#include <stdio.h> /* needed for FILE */
-
-#include "curl.h"
+#include "curl.h" /* for CURL_EXTERN */
#ifdef __cplusplus
extern "C" {
@@ -44,29 +43,6 @@ CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
CURL_EXTERN char *curl_maprintf(const char *format, ...);
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
-#ifdef _MPRINTF_REPLACE
-# undef printf
-# undef fprintf
-# undef sprintf
-# undef vsprintf
-# undef snprintf
-# undef vprintf
-# undef vfprintf
-# undef vsnprintf
-# undef aprintf
-# undef vaprintf
-# define printf curl_mprintf
-# define fprintf curl_mfprintf
-# define sprintf curl_msprintf
-# define vsprintf curl_mvsprintf
-# define snprintf curl_msnprintf
-# define vprintf curl_mvprintf
-# define vfprintf curl_mvfprintf
-# define vsnprintf curl_mvsnprintf
-# define aprintf curl_maprintf
-# define vaprintf curl_mvaprintf
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/MP/code/curl-7.46.0/include/curl/multi.h b/MP/code/curl-7.49.1/include/curl/multi.h
similarity index 99%
rename from MP/code/curl-7.46.0/include/curl/multi.h
rename to MP/code/curl-7.49.1/include/curl/multi.h
index 36e2e94..0fbbd96 100644
--- a/MP/code/curl-7.46.0/include/curl/multi.h
+++ b/MP/code/curl-7.49.1/include/curl/multi.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/MP/code/curl-7.46.0/include/curl/stdcheaders.h b/MP/code/curl-7.49.1/include/curl/stdcheaders.h
similarity index 94%
rename from MP/code/curl-7.46.0/include/curl/stdcheaders.h
rename to MP/code/curl-7.49.1/include/curl/stdcheaders.h
index ad82ef6..6f0f7f3 100644
--- a/MP/code/curl-7.46.0/include/curl/stdcheaders.h
+++ b/MP/code/curl-7.49.1/include/curl/stdcheaders.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/MP/code/curl-7.46.0/include/curl/typecheck-gcc.h b/MP/code/curl-7.49.1/include/curl/typecheck-gcc.h
similarity index 99%
rename from MP/code/curl-7.46.0/include/curl/typecheck-gcc.h
rename to MP/code/curl-7.49.1/include/curl/typecheck-gcc.h
index 2e24db0..6ec8bcf 100644
--- a/MP/code/curl-7.46.0/include/curl/typecheck-gcc.h
+++ b/MP/code/curl-7.49.1/include/curl/typecheck-gcc.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/MP/code/libs/win32/libcurl.a b/MP/code/libs/win32/libcurl.a
index 9acf40c..effd743 100644
Binary files a/MP/code/libs/win32/libcurl.a and b/MP/code/libs/win32/libcurl.a differ
diff --git a/MP/code/libs/win64/libcurl.a b/MP/code/libs/win64/libcurl.a
index 929788f..d4d6501 100644
Binary files a/MP/code/libs/win64/libcurl.a and b/MP/code/libs/win64/libcurl.a differ
diff --git a/SP/code/client/cl_curl.h b/SP/code/client/cl_curl.h
index 3ab8535..6fc9265 100644
--- a/SP/code/client/cl_curl.h
+++ b/SP/code/client/cl_curl.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/qcommon.h"
#ifdef USE_LOCAL_HEADERS
- #include "../curl-7.46.0/include/curl/curl.h"
+ #include "../curl-7.49.1/include/curl/curl.h"
#else
#include <curl/curl.h>
#endif
diff --git a/SP/code/curl-7.46.0/include/README b/SP/code/curl-7.49.1/include/README
similarity index 100%
rename from SP/code/curl-7.46.0/include/README
rename to SP/code/curl-7.49.1/include/README
diff --git a/MP/code/curl-7.46.0/include/curl/curl.h b/SP/code/curl-7.49.1/include/curl/curl.h
similarity index 97%
rename from MP/code/curl-7.46.0/include/curl/curl.h
rename to SP/code/curl-7.49.1/include/curl/curl.h
index 45c5063..57e716b 100644
--- a/MP/code/curl-7.46.0/include/curl/curl.h
+++ b/SP/code/curl-7.49.1/include/curl/curl.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -24,10 +24,10 @@
/*
* If you have libcurl problems, all docs and details are found here:
- * http://curl.haxx.se/libcurl/
+ * https://curl.haxx.se/libcurl/
*
* curl-library mailing list subscription and unsubscription web interface:
- * http://cool.haxx.se/mailman/listinfo/curl-library/
+ * https://cool.haxx.se/mailman/listinfo/curl-library/
*/
#include "curlver.h" /* libcurl version defines */
@@ -56,7 +56,8 @@
#include <time.h>
#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
-#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || defined(__LWIP_OPT_H__))
+#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
+ defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
/* The check above prevents the winsock2 inclusion if winsock.h already was
included, since they can't co-exist without problems */
#include <winsock2.h>
@@ -112,7 +113,7 @@ typedef void CURL;
#ifndef curl_socket_typedef
/* socket typedef */
-#if defined(WIN32) && !defined(__LWIP_OPT_H__)
+#if defined(WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)
typedef SOCKET curl_socket_t;
#define CURL_SOCKET_BAD INVALID_SOCKET
#else
@@ -372,6 +373,7 @@ typedef curlioerr (*curl_ioctl_callback)(CURL *handle,
int cmd,
void *clientp);
+#ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS
/*
* The following typedef's are signatures of malloc, free, realloc, strdup and
* calloc respectively. Function pointers of these types can be passed to the
@@ -384,6 +386,9 @@ typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
typedef char *(*curl_strdup_callback)(const char *str);
typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
+#define CURL_DID_MEMORY_FUNC_TYPEDEFS
+#endif
+
/* the kind of data that is passed to information_callback*/
typedef enum {
CURLINFO_TEXT = 0,
@@ -470,9 +475,9 @@ typedef enum {
CURLE_OBSOLETE44, /* 44 - NOT USED */
CURLE_INTERFACE_FAILED, /* 45 - CURLOPT_INTERFACE failed */
CURLE_OBSOLETE46, /* 46 - NOT USED */
- CURLE_TOO_MANY_REDIRECTS , /* 47 - catch endless re-direct loops */
+ CURLE_TOO_MANY_REDIRECTS, /* 47 - catch endless re-direct loops */
CURLE_UNKNOWN_OPTION, /* 48 - User specified an unknown option */
- CURLE_TELNET_OPTION_SYNTAX , /* 49 - Malformed telnet option */
+ CURLE_TELNET_OPTION_SYNTAX, /* 49 - Malformed telnet option */
CURLE_OBSOLETE50, /* 50 - NOT USED */
CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint
wasn't verified fine */
@@ -534,6 +539,8 @@ typedef enum {
CURLE_SSL_PINNEDPUBKEYNOTMATCH, /* 90 - specified pinned public key did not
match */
CURLE_SSL_INVALIDCERTSTATUS, /* 91 - invalid certificate status */
+ CURLE_HTTP2_STREAM, /* 92 - stream error in HTTP/2 framing layer
+ */
CURL_LAST /* never use! */
} CURLcode;
@@ -1459,7 +1466,7 @@ typedef enum {
CINIT(TFTP_BLKSIZE, LONG, 178),
/* Socks Service */
- CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179),
+ CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179), /* DEPRECATED, do not use! */
/* Socks Service */
CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
@@ -1672,6 +1679,16 @@ typedef enum {
/* Set E-xclusive stream dependency on another CURL handle */
CINIT(STREAM_DEPENDS_E, OBJECTPOINT, 241),
+ /* Do not send any tftp option requests to the server */
+ CINIT(TFTP_NO_OPTIONS, LONG, 242),
+
+ /* Linked-list of host:port:connect-to-host:connect-to-port,
+ overrides the URL's host:port (only for the network layer) */
+ CINIT(CONNECT_TO, OBJECTPOINT, 243),
+
+ /* Set TCP Fast Open */
+ CINIT(TCP_FASTOPEN, LONG, 244),
+
CURLOPT_LASTENTRY /* the last unused */
} CURLoption;
@@ -1721,7 +1738,10 @@ enum {
for us! */
CURL_HTTP_VERSION_1_0, /* please use HTTP 1.0 in the request */
CURL_HTTP_VERSION_1_1, /* please use HTTP 1.1 in the request */
- CURL_HTTP_VERSION_2_0, /* please use HTTP 2.0 in the request */
+ CURL_HTTP_VERSION_2_0, /* please use HTTP 2 in the request */
+ CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */
+ CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, /* please use HTTP 2 without HTTP/1.1
+ Upgrade */
CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
};
@@ -2105,9 +2125,14 @@ typedef enum {
CURLSSLBACKEND_MBEDTLS = 11
} curl_sslbackend;
+/* aliases for library clones and renames */
+#define CURLSSLBACKEND_LIBRESSL 1
+#define CURLSSLBACKEND_BORINGSSL 1
+#define CURLSSLBACKEND_WOLFSSL 6
+
/* Information about the SSL library used and the respective internal SSL
handle, which can be used to obtain further information regarding the
- connection. Asked for with CURLINFO_TLS_SESSION. */
+ connection. Asked for with CURLINFO_TLS_SSL_PTR or CURLINFO_TLS_SESSION. */
struct curl_tlssessioninfo {
curl_sslbackend backend;
void *internals;
@@ -2167,9 +2192,10 @@ typedef enum {
CURLINFO_LOCAL_PORT = CURLINFO_LONG + 42,
CURLINFO_TLS_SESSION = CURLINFO_SLIST + 43,
CURLINFO_ACTIVESOCKET = CURLINFO_SOCKET + 44,
+ CURLINFO_TLS_SSL_PTR = CURLINFO_SLIST + 45,
/* Fill in new entries below here! */
- CURLINFO_LASTONE = 44
+ CURLINFO_LASTONE = 45
} CURLINFO;
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
@@ -2329,6 +2355,8 @@ typedef struct {
#define CURL_VERSION_GSSAPI (1<<17) /* Built against a GSS-API library */
#define CURL_VERSION_KERBEROS5 (1<<18) /* Kerberos V5 auth is supported */
#define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */
+#define CURL_VERSION_PSL (1<<20) /* Mozilla's Public Suffix List, used
+ for cookie domain verification */
/*
* NAME curl_version_info()
diff --git a/MP/code/curl-7.46.0/include/curl/curlbuild.h b/SP/code/curl-7.49.1/include/curl/curlbuild.h
similarity index 98%
rename from MP/code/curl-7.46.0/include/curl/curlbuild.h
rename to SP/code/curl-7.49.1/include/curl/curlbuild.h
index 941711a..ae95095 100644
--- a/MP/code/curl-7.46.0/include/curl/curlbuild.h
+++ b/SP/code/curl-7.49.1/include/curl/curlbuild.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -49,7 +49,7 @@
*
* If you think that something actually needs to be changed, adjusted
* or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
+ * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
*
* Try to keep one section per platform, compiler and architecture,
* otherwise, if an existing section is reused for a different one and
@@ -527,9 +527,9 @@
/* ===================================== */
#elif defined(__GNUC__)
-# if defined(__ILP32__) || \
- defined(__i386__) || defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || \
- defined(__sparc__) || defined(__mips__) || defined(__sh__)
+# if !defined(__LP64__) && (defined(__ILP32__) || \
+ defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
+ defined(__sparc__) || defined(__mips__) || defined(__sh__))
# define CURL_SIZEOF_LONG 4
# define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_FORMAT_CURL_OFF_T "lld"
@@ -539,7 +539,7 @@
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
# elif defined(__LP64__) || \
- defined(__x86_64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__sparc64__)
+ defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
# define CURL_SIZEOF_LONG 8
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
diff --git a/SP/code/curl-7.46.0/include/curl/curlrules.h b/SP/code/curl-7.49.1/include/curl/curlrules.h
similarity index 98%
rename from SP/code/curl-7.46.0/include/curl/curlrules.h
rename to SP/code/curl-7.49.1/include/curl/curlrules.h
index 7c2ede3..55d21f6 100644
--- a/SP/code/curl-7.46.0/include/curl/curlrules.h
+++ b/SP/code/curl-7.49.1/include/curl/curlrules.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -47,7 +47,7 @@
* library is properly built and used.
*
* You can find further help on the libcurl development mailing list:
- * http://cool.haxx.se/mailman/listinfo/curl-library/
+ * https://cool.haxx.se/mailman/listinfo/curl-library/
*
* NOTE 2
* ------
diff --git a/MP/code/curl-7.46.0/include/curl/curlver.h b/SP/code/curl-7.49.1/include/curl/curlver.h
similarity index 87%
rename from MP/code/curl-7.46.0/include/curl/curlver.h
rename to SP/code/curl-7.49.1/include/curl/curlver.h
index af8b178..4e0bc22 100644
--- a/MP/code/curl-7.46.0/include/curl/curlver.h
+++ b/SP/code/curl-7.49.1/include/curl/curlver.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -26,17 +26,17 @@
a script at release-time. This was made its own header file in 7.11.2 */
/* This is the global package copyright */
-#define LIBCURL_COPYRIGHT "1996 - 2015 Daniel Stenberg, <daniel at haxx.se>."
+#define LIBCURL_COPYRIGHT "1996 - 2016 Daniel Stenberg, <daniel at haxx.se>."
/* This is the version number of the libcurl package from which this header
file origins: */
-#define LIBCURL_VERSION "7.46.0"
+#define LIBCURL_VERSION "7.49.1"
/* The numeric version number is also available "in parts" by using these
defines: */
#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 46
-#define LIBCURL_VERSION_PATCH 0
+#define LIBCURL_VERSION_MINOR 49
+#define LIBCURL_VERSION_PATCH 1
/* This is the numeric version of the libcurl version number, meant for easier
parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -57,7 +57,7 @@
CURL_VERSION_BITS() macro since curl's own configure script greps for it
and needs it to contain the full number.
*/
-#define LIBCURL_VERSION_NUM 0x072e00
+#define LIBCURL_VERSION_NUM 0x073101
/*
* This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
*
* "Mon Feb 12 11:35:33 UTC 2007"
*/
-#define LIBCURL_TIMESTAMP "ons 2 dec 2015 07:02:16 UTC"
+#define LIBCURL_TIMESTAMP "Mon May 30 06:15:46 UTC 2016"
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
#define CURL_AT_LEAST_VERSION(x,y,z) \
diff --git a/MP/code/curl-7.46.0/include/curl/easy.h b/SP/code/curl-7.49.1/include/curl/easy.h
similarity index 98%
rename from MP/code/curl-7.46.0/include/curl/easy.h
rename to SP/code/curl-7.49.1/include/curl/easy.h
index c1e3e76..afc766c 100644
--- a/MP/code/curl-7.46.0/include/curl/easy.h
+++ b/SP/code/curl-7.49.1/include/curl/easy.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/SP/code/curl-7.46.0/include/curl/mprintf.h b/SP/code/curl-7.49.1/include/curl/mprintf.h
similarity index 74%
rename from SP/code/curl-7.46.0/include/curl/mprintf.h
rename to SP/code/curl-7.49.1/include/curl/mprintf.h
index c6b0d76..e20f546 100644
--- a/SP/code/curl-7.46.0/include/curl/mprintf.h
+++ b/SP/code/curl-7.49.1/include/curl/mprintf.h
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel at haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel at haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -24,8 +24,7 @@
#include <stdarg.h>
#include <stdio.h> /* needed for FILE */
-
-#include "curl.h"
+#include "curl.h" /* for CURL_EXTERN */
#ifdef __cplusplus
extern "C" {
@@ -44,29 +43,6 @@ CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
CURL_EXTERN char *curl_maprintf(const char *format, ...);
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
-#ifdef _MPRINTF_REPLACE
-# undef printf
-# undef fprintf
-# undef sprintf
-# undef vsprintf
-# undef snprintf
-# undef vprintf
-# undef vfprintf
-# undef vsnprintf
-# undef aprintf
-# undef vaprintf
-# define printf curl_mprintf
-# define fprintf curl_mfprintf
-# define sprintf curl_msprintf
-# define vsprintf curl_mvsprintf
-# define snprintf curl_msnprintf
-# define vprintf curl_mvprintf
-# define vfprintf curl_mvfprintf
-# define vsnprintf curl_mvsnprintf
-# define aprintf curl_maprintf
-# define vaprintf curl_mvaprintf
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/SP/code/curl-7.46.0/include/curl/multi.h b/SP/code/curl-7.49.1/include/curl/multi.h
similarity index 99%
rename from SP/code/curl-7.46.0/include/curl/multi.h
rename to SP/code/curl-7.49.1/include/curl/multi.h
index 36e2e94..0fbbd96 100644
--- a/SP/code/curl-7.46.0/include/curl/multi.h
+++ b/SP/code/curl-7.49.1/include/curl/multi.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/SP/code/curl-7.46.0/include/curl/stdcheaders.h b/SP/code/curl-7.49.1/include/curl/stdcheaders.h
similarity index 94%
rename from SP/code/curl-7.46.0/include/curl/stdcheaders.h
rename to SP/code/curl-7.49.1/include/curl/stdcheaders.h
index ad82ef6..6f0f7f3 100644
--- a/SP/code/curl-7.46.0/include/curl/stdcheaders.h
+++ b/SP/code/curl-7.49.1/include/curl/stdcheaders.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/SP/code/curl-7.46.0/include/curl/typecheck-gcc.h b/SP/code/curl-7.49.1/include/curl/typecheck-gcc.h
similarity index 99%
rename from SP/code/curl-7.46.0/include/curl/typecheck-gcc.h
rename to SP/code/curl-7.49.1/include/curl/typecheck-gcc.h
index 2e24db0..6ec8bcf 100644
--- a/SP/code/curl-7.46.0/include/curl/typecheck-gcc.h
+++ b/SP/code/curl-7.49.1/include/curl/typecheck-gcc.h
@@ -11,7 +11,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
diff --git a/SP/code/libs/win32/libcurl.a b/SP/code/libs/win32/libcurl.a
index 9acf40c..effd743 100644
Binary files a/SP/code/libs/win32/libcurl.a and b/SP/code/libs/win32/libcurl.a differ
diff --git a/SP/code/libs/win64/libcurl.a b/SP/code/libs/win64/libcurl.a
index 929788f..d4d6501 100644
Binary files a/SP/code/libs/win64/libcurl.a and b/SP/code/libs/win64/libcurl.a differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list