Commit 42b5f1b3 authored by Natanael Copa's avatar Natanael Copa

main/curl: upgrade to 7.35.0

parent 2c379b93
From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@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
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=curl
pkgver=7.34.0
pkgrel=1
pkgver=7.35.0
pkgrel=0
pkgdesc="An URL retrival utility and library"
url="http://curl.haxx.se"
arch="all"
......@@ -9,8 +9,7 @@ license="MIT"
depends="ca-certificates"
depends_dev="zlib-dev openssl-dev libssh2-dev"
makedepends="$depends_dev"
source="http://curl.haxx.se/download/curl-$pkgver.tar.bz2
0001-connect-Try-all-addresses-in-first-connection-attemp.patch"
source="http://curl.haxx.se/download/curl-$pkgver.tar.bz2"
subpackages="$pkgname-doc $pkgname-dev"
_builddir="$srcdir/$pkgname-$pkgver"
......@@ -44,9 +43,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la || return 1
}
md5sums="88491df2bb32e9146e776ae6ac2f8327 curl-7.34.0.tar.bz2
ee755b0e886207fc1e8154e426c46ca7 0001-connect-Try-all-addresses-in-first-connection-attemp.patch"
sha256sums="10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b curl-7.34.0.tar.bz2
60502a73d69abdc11444ada436bc46157470f68b0af0eaec5f4fc6322d25e37c 0001-connect-Try-all-addresses-in-first-connection-attemp.patch"
sha512sums="7158521e5d75f3f7e0373bed7a4e71351699239f7109ef43363d6f09c7bf6d65b64c3b54b62e65c709761cba2e08e35b728ac7458fbd68fe249b8471cce86971 curl-7.34.0.tar.bz2
fdbf372c912b39c910c9b3e9f3efb3038280b9e9e48b613790915ea9579f2d1ab373e6e6de939ff81ac87e557177df02fabdb6f4a9ca38849e3cc84fddc054f3 0001-connect-Try-all-addresses-in-first-connection-attemp.patch"
md5sums="c18fbdd031adb0529ae09fce399f2d10 curl-7.35.0.tar.bz2"
sha256sums="d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83 curl-7.35.0.tar.bz2"
sha512sums="aa669d9f62adbdcbfb89bd00893648ddf60bf5bc2d79c65e2a202c651ff57757f6b1de9fe94fd416923b89ffa7e9ffc65b6301b1c6dd2382df6dd5dccc55a23b curl-7.35.0.tar.bz2"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment