From 5a5b607596dbcd63166097c8187d65fae51e0fea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Nov 2011 10:41:52 +0100 Subject: [PATCH] curl: update to curl-7.23.1 Signed-off-by: Stephan Raue --- packages/web/curl/meta | 2 +- .../curl-7.22.0-0108-threaded_dns_multi.patch | 41 ------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 packages/web/curl/patches/curl-7.22.0-0108-threaded_dns_multi.patch diff --git a/packages/web/curl/meta b/packages/web/curl/meta index b70eaed674..b91eff1e70 100644 --- a/packages/web/curl/meta +++ b/packages/web/curl/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="curl" -PKG_VERSION="7.22.0" +PKG_VERSION="7.23.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" diff --git a/packages/web/curl/patches/curl-7.22.0-0108-threaded_dns_multi.patch b/packages/web/curl/patches/curl-7.22.0-0108-threaded_dns_multi.patch deleted file mode 100644 index 30dbccc586..0000000000 --- a/packages/web/curl/patches/curl-7.22.0-0108-threaded_dns_multi.patch +++ /dev/null @@ -1,41 +0,0 @@ - lib/multi.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -diff --git a/lib/multi.c b/lib/multi.c -index 476cb81..74eb0f4 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -933,9 +933,16 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, - easy->result = addHandleToSendOrPendPipeline(easy->easy_handle, - easy->easy_conn); - if(CURLE_OK == easy->result) { -- if(async) -+ if(async) { - /* We're now waiting for an asynchronous name lookup */ - multistate(easy, CURLM_STATE_WAITRESOLVE); -+#ifdef USE_THREADS_POSIX -+ /* Curl_resolv_getsock() is not properly implemented in case -+ * we use POSIX threaded DNS resolver, we have to hang */ -+ result = CURLM_CALL_MULTI_PERFORM; -+ break; -+#endif -+ } - else { - /* after the connect has been sent off, go WAITCONNECT unless the - protocol connect is already done and we can go directly to -@@ -1003,6 +1010,14 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, - disconnect_conn = TRUE; - break; - } -+#ifdef USE_THREADS_POSIX -+ /* Curl_resolv_getsock() is not properly implemented yet in case -+ * we use POSIX threaded DNS resolver, we have to hang */ -+ Curl_socket_ready(CURL_SOCKET_BAD, CURL_SOCKET_BAD, 100 /* ms */); -+ result = CURLM_CALL_MULTI_PERFORM; -+ break; -+#endif -+ - } - break; - -