Main changes: - URL parser: IPv6 zone identifiers are now supported - cyassl: Use error-ssl.h when available (drop local patch) - polarssl: support CURLOPT_CAPATH / --capath - mkhelp: generate code for --disable-manual as well (drop local patch) Full release notes: http://curl.haxx.se/changes.html MIPS 34kc binary size: - 7.36.0 before: 82,539 bytes - 7.38.0 after: 83,321 bytes Signed-off-by: Catalin Patulea <cat@vv.carleton.ca> SVN-Revision: 42517master
parent
0a5caa47e5
commit
275ba42c52
@ -1,45 +0,0 @@ |
||||
From 0204e17bc656e6c59b4010283e67f9251eb12c41 Mon Sep 17 00:00:00 2001
|
||||
From: Dan Fandrich <dan@coneharvesters.com>
|
||||
Date: Wed, 23 Apr 2014 11:01:30 +0200
|
||||
Subject: [PATCH] cyassl: Use error-ssl.h when available
|
||||
|
||||
Versions since at least 2.9.4 renamed error.h to error-ssl.h, so use
|
||||
whichever one is available.
|
||||
---
|
||||
configure.ac | 3 +++
|
||||
lib/vtls/cyassl.c | 9 +++++++--
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2003,6 +2003,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
|
||||
dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
|
||||
AC_CHECK_SIZEOF(long long)
|
||||
|
||||
+ dnl Versions since at least 2.9.4 renamed error.h to error-ssl.h
|
||||
+ AC_CHECK_HEADERS(cyassl/error-ssl.h)
|
||||
+
|
||||
LIBS="-lcyassl -lm $LIBS"
|
||||
|
||||
if test -n "$cyassllib"; then
|
||||
--- a/lib/vtls/cyassl.c
|
||||
+++ b/lib/vtls/cyassl.c
|
||||
@@ -47,11 +47,16 @@
|
||||
#define _MPRINTF_REPLACE /* use our functions only */
|
||||
#include <curl/mprintf.h>
|
||||
#include "curl_memory.h"
|
||||
-/* The last #include file should be: */
|
||||
-#include "memdebug.h"
|
||||
+
|
||||
#include <cyassl/ssl.h>
|
||||
+#ifdef HAVE_CYASSL_ERROR_SSL_H
|
||||
+#include <cyassl/error-ssl.h>
|
||||
+#else
|
||||
#include <cyassl/error.h>
|
||||
+#endif
|
||||
|
||||
+/* The last #include file should be: */
|
||||
+#include "memdebug.h"
|
||||
|
||||
static Curl_recv cyassl_recv;
|
||||
static Curl_send cyassl_send;
|
@ -1,13 +0,0 @@ |
||||
--- a/src/tool_hugehelp.h
|
||||
+++ b/src/tool_hugehelp.h
|
||||
@@ -23,6 +23,10 @@
|
||||
***************************************************************************/
|
||||
#include "tool_setup.h"
|
||||
|
||||
+#ifdef USE_MANUAL
|
||||
void hugehelp(void);
|
||||
+#else
|
||||
+#define hugehelp() Curl_nop_stmt
|
||||
+#endif
|
||||
|
||||
#endif /* HEADER_CURL_TOOL_HUGEHELP_H */
|
Loading…
Reference in new issue