f76bbcb532
- update to 7.36
* fixes CVE-2014-0138 (bnc#868627) and CVE-2014-0139 (bnc#868629)
* NEW FEATURES:
ntlm: Added support for NTLMv2
tool: Added support for URL specific options
openssl: add ALPN support
gtls: add ALPN support
nss: add ALPN and NPN support
added CURLOPT_EXPECT_100_TIMEOUT_MS
tool: add --no-alpn and --no-npn
added CURLOPT_SSL_ENABLE_NPN and CURLOPT_SSL_ENABLE_ALPN
http2: build with current nghttp2 version
openssl: info message with SSL version used
* dropped curl-test172_cookie_expiration.patch (upstream)
* added patches to make it build:
- curl-mkhelp.patch
- curl-test815.patch
OBS-URL: https://build.opensuse.org/request/show/229525
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=106
35 lines
899 B
Diff
35 lines
899 B
Diff
From 38d582ff541353d738858299d4a2b78bafac03ed Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Wed, 26 Mar 2014 13:22:10 +0100
|
|
Subject: [PATCH] mkhelp: generate code for --disable-manual as well
|
|
|
|
This allows configure --disable-manual to run and build without having
|
|
to regenerate the src/tool_hugehelp.c file which otherwise is necessary
|
|
since we ship tarballs with that file present.
|
|
|
|
Reported-by: Remi Gacogne
|
|
Bug: http://curl.haxx.se/bug/view.cgi?id=1350
|
|
---
|
|
src/mkhelp.pl | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
|
|
index 444b669..7ed86f7 100644
|
|
--- a/src/mkhelp.pl
|
|
+++ b/src/mkhelp.pl
|
|
@@ -256,6 +256,10 @@
|
|
|
|
sub foot {
|
|
print <<FOOT
|
|
+#else /* !USE_MANUAL */
|
|
+/* built-in manual is disabled, blank function */
|
|
+#include "tool_hugehelp.h"
|
|
+void hugehelp(void) {}
|
|
#endif /* USE_MANUAL */
|
|
FOOT
|
|
;
|
|
--
|
|
1.9.1
|
|
|
|
|