Various plugins: Set the cURL option "CURLOPT_NOSIGNAL".

[collectd.git] / src / nginx.c

diff --git a/src/nginx.c b/src/nginx.c
index 2de3633..d952951 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/nginx.c
  * Copyright (C) 2006,2007  Florian octo Forster
+ * Copyright (C) 2008       Sebastian Harl
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -18,6 +19,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Sebastian Harl <sh at tokkee.org>
  **/
 
 #include "collectd.h"
@@ -117,6 +119,7 @@ static int init (void)
     return (-1);
   }
 
+  curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
   curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, nginx_curl_callback);
   curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
   curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, nginx_curl_error);
@@ -139,7 +142,9 @@ static int init (void)
     curl_easy_setopt (curl, CURLOPT_URL, url);
   }
 
-  if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
+  curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
+
+  if ((verify_peer == NULL) || IS_TRUE (verify_peer))
   {
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
   }
@@ -148,7 +153,7 @@ static int init (void)
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
   }
 
-  if ((verify_host == NULL) || (strcmp (verify_host, "true") == 0))
+  if ((verify_host == NULL) || IS_TRUE (verify_host))
   {
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
   }