summaryrefslogtreecommitdiff
path: root/package/curl/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-04-25 03:04:47 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2015-04-25 03:04:47 (GMT)
commitc5fa33fe50913381685a5d609713f8d1f5d63ba8 (patch)
treeee1e8e12b4b7575bb071ecbfbf9cf5e6acf497cb /package/curl/patches
parent74e7797a2f1a8cb7c96c74a48a94268879780d7d (diff)
update curl to latest stable version
Diffstat (limited to 'package/curl/patches')
-rw-r--r--package/curl/patches/patch-lib_url_c28
-rw-r--r--package/curl/patches/patch-src_tool_operate_c6
2 files changed, 31 insertions, 3 deletions
diff --git a/package/curl/patches/patch-lib_url_c b/package/curl/patches/patch-lib_url_c
new file mode 100644
index 0000000..f4c9345
--- /dev/null
+++ b/package/curl/patches/patch-lib_url_c
@@ -0,0 +1,28 @@
+--- curl-7.42.0.orig/lib/url.c 2015-04-22 07:55:54.000000000 +0200
++++ curl-7.42.0/lib/url.c 2015-04-24 18:00:21.000000000 +0200
+@@ -3069,9 +3069,11 @@ ConnectionExists(struct SessionHandle *d
+ struct connectdata *check;
+ struct connectdata *chosen = 0;
+ bool canPipeline = IsPipeliningPossible(data, needle);
++#ifdef USE_NTLM
+ bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) ||
+ (data->state.authhost.want & CURLAUTH_NTLM_WB)) &&
+ (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE;
++#endif
+ struct connectbundle *bundle;
+
+ *force_reuse = FALSE;
+@@ -3208,8 +3210,11 @@ ConnectionExists(struct SessionHandle *d
+ continue;
+ }
+
+- if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) ||
+- (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) {
++ if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST))
++#ifdef USE_NTLM
++ || (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)
++#endif
++ ) {
+ /* This protocol requires credentials per connection or is HTTP+NTLM,
+ so verify that we're using the same name and password as well */
+ if(!strequal(needle->user, check->user) ||
diff --git a/package/curl/patches/patch-src_tool_operate_c b/package/curl/patches/patch-src_tool_operate_c
index eb1a3d5..f9b563b 100644
--- a/package/curl/patches/patch-src_tool_operate_c
+++ b/package/curl/patches/patch-src_tool_operate_c
@@ -1,6 +1,6 @@
---- curl-7.36.0.orig/src/tool_operate.c 2014-03-25 11:36:28.000000000 +0100
-+++ curl-7.36.0/src/tool_operate.c 2014-04-02 14:59:00.000000000 +0200
-@@ -1794,8 +1794,10 @@ CURLcode operate(struct GlobalConfig *co
+--- curl-7.42.0.orig/src/tool_operate.c 2015-04-16 23:39:50.000000000 +0200
++++ curl-7.42.0/src/tool_operate.c 2015-04-24 13:31:09.000000000 +0200
+@@ -1828,8 +1828,10 @@ CURLcode operate(struct GlobalConfig *co
if(res == PARAM_HELP_REQUESTED)
tool_help();
/* Check if we were asked for the manual */