summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/curl/Makefile4
-rw-r--r--package/curl/patches/patch-lib_url_c28
2 files changed, 2 insertions, 30 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 17bbda944..a977913a2 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= curl
-PKG_VERSION:= 7.42.0
+PKG_VERSION:= 7.42.1
PKG_RELEASE:= 1
-PKG_HASH:= 088f6a63289dbdcf23d692fdfaaf6262c19e373beb5237b9b9e7bcf9815a8f49
+PKG_HASH:= 4fc504f4fac56d091162707941d06c72a4222fc6fa48ca8193e44ee74baf079c
PKG_DESCR:= client-side url transfer tool
PKG_SECTION:= net/http
PKG_DEPENDS:= libcurl
diff --git a/package/curl/patches/patch-lib_url_c b/package/curl/patches/patch-lib_url_c
deleted file mode 100644
index f4c934576..000000000
--- a/package/curl/patches/patch-lib_url_c
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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) ||