Date: Sunday, February 9, 2014 @ 07:24:31 Author: dwallace Revision: 105488
upgpkg: lib32-curl 7.35.0-1 upgpkg: lib32-curl 7.35.0 Modified: lib32-curl/trunk/PKGBUILD Deleted: lib32-curl/trunk/0001-connect-Try-all-addresses-in-first-connection-attemp.patch -----------------------------------------------------------------+ 0001-connect-Try-all-addresses-in-first-connection-attemp.patch | 47 ---------- PKGBUILD | 17 +-- 2 files changed, 5 insertions(+), 59 deletions(-) Deleted: 0001-connect-Try-all-addresses-in-first-connection-attemp.patch =================================================================== --- 0001-connect-Try-all-addresses-in-first-connection-attemp.patch 2014-02-09 06:17:37 UTC (rev 105487) +++ 0001-connect-Try-all-addresses-in-first-connection-attemp.patch 2014-02-09 06:24:31 UTC (rev 105488) @@ -1,47 +0,0 @@ -From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bj...@haxx.se> -Date: Sat, 28 Dec 2013 13:42:57 +0100 -Subject: [PATCH] connect: Try all addresses in first connection attempt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes a bug when all addresses in the first family fail immediately, due -to "Network unreachable" for example, curl would hang and never try the -next address family. - -Iterate through all address families when to trying establish the first -connection attempt. - -Bug: http://curl.haxx.se/bug/view.cgi?id=1315 -Reported-by: Michal Górny and Anthony G. Basile ---- - lib/connect.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/connect.c b/lib/connect.c -index 4b6ee00..588ac28 100644 ---- a/lib/connect.c -+++ b/lib/connect.c -@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ - conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2; - - /* start connecting to first IP */ -- res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -- while(res != CURLE_OK && -- conn->tempaddr[0] && -- conn->tempaddr[0]->ai_next && -- conn->tempsock[0] == CURL_SOCKET_BAD) -- res = trynextip(conn, FIRSTSOCKET, 0); -+ while(conn->tempaddr[0]) { -+ res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -+ if(res == CURLE_OK) -+ break; -+ conn->tempaddr[0] = conn->tempaddr[0]->ai_next; -+ } - - if(conn->tempsock[0] == CURL_SOCKET_BAD) - return res; --- -1.8.5.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-02-09 06:17:37 UTC (rev 105487) +++ PKGBUILD 2014-02-09 06:24:31 UTC (rev 105488) @@ -8,25 +8,18 @@ pkgname=lib32-curl _pkgname=curl -pkgver=7.34.0 -pkgrel=2 +pkgver=7.35.0 +pkgrel=1 pkgdesc="An URL retrieval utility and library (32-bit)" arch=('x86_64') url="http://curl.haxx.se" license=('MIT') depends=('lib32-libssh2' 'lib32-krb5' "${_pkgname}") -source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc} - 0001-connect-Try-all-addresses-in-first-connection-attemp.patch) -md5sums=('d5b7edccbd1793e3549842e01331da20' - 'SKIP' - 'ee755b0e886207fc1e8154e426c46ca7') +source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('f5ae45ed6e86debb721b68392b5ce13c' + 'SKIP') -prepare() { - cd "$_pkgname-$pkgver" - patch -Np1 <"$srcdir"/0001-connect-Try-all-addresses-in-first-connection-attemp.patch -} - build() { cd "$_pkgname-$pkgver"