Code

patches/curl-followlocation.dpatch: Updated for 4.7.
authorSebastian Harl <sh@tokkee.org>
Thu, 27 Aug 2009 22:02:49 +0000 (00:02 +0200)
committerSebastian Harl <sh@tokkee.org>
Thu, 27 Aug 2009 22:02:49 +0000 (00:02 +0200)
I.e. include the changes introduced when merging that patch into the upstream
collectd-4.7 branch.

debian/patches/curl-followlocation.dpatch

index 0d9bc34cb1d3f3c4c0cc2e57c3db1f39b860efe9..b412637a8f5a486232200975695a9b42da5ff582 100755 (executable)
@@ -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