From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 27 Aug 2009 22:02:49 +0000 (+0200)
Subject: patches/curl-followlocation.dpatch: Updated for 4.7.
X-Git-Tag: collectd-4.7.2-1~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7088506e2051ebb1237089eeedc7512d90da8121;p=pkg-collectd.git

patches/curl-followlocation.dpatch: Updated for 4.7.

I.e. include the changes introduced when merging that patch into the upstream
collectd-4.7 branch.
---

diff --git a/debian/patches/curl-followlocation.dpatch b/debian/patches/curl-followlocation.dpatch
index 0d9bc34..b412637 100755
--- a/debian/patches/curl-followlocation.dpatch
+++ b/debian/patches/curl-followlocation.dpatch
@@ -8,13 +8,13 @@
 diff a/src/apache.c b/src/apache.c
 --- a/src/apache.c
 +++ b/src/apache.c
-@@ -160,6 +160,7 @@ static int init (void)
+@@ -458,6 +458,7 @@ static int init_host (apache_t *st) /* {{{ */
  	}
  
- 	curl_easy_setopt (curl, CURLOPT_URL, url);
-+	curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
++	curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1);
  
- 	if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
+ 	if (st->verify_peer != 0)
  	{
 diff a/src/ascent.c b/src/ascent.c
 --- a/src/ascent.c