summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 992714a)
raw | patch | inline | side by side (parent: 992714a)
author | Sebastian Harl <sh@tokkee.org> | |
Sun, 23 Nov 2014 14:37:03 +0000 (15:37 +0100) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Sun, 23 Nov 2014 14:37:03 +0000 (15:37 +0100) |
debian/patches/bts770683_curl_init.dpatch | patch | blob | history |
index b1f1c427def84f585b0086468836fe4c011cbc8f..8529bf437ebe1f41e38d7de1b5fe4a6fe668d883 100755 (executable)
## DP:
## DP: Upstream commits:
## DP: https://github.com/katzj/collectd/commit/401fa6e
-## DP: https://github.com/katzj/collectd/commit/50dbebf
@DPATCH@
-diff a/src/apache.c b/src/apache.c
---- a/src/apache.c
-+++ b/src/apache.c
-@@ -671,9 +671,18 @@ static int apache_read_host (user_data_t *user_data) /* {{{ */
- return (0);
- } /* }}} int apache_read_host */
-
-+static int apache_init (void) /* {{{ */
-+{
-+ /* Call this while collectd is still single-threaded to avoid
-+ * initialization issues in libgcrypt. */
-+ curl_global_init (CURL_GLOBAL_SSL);
-+ return (0);
-+} /* }}} int apache_init */
-+
- void module_register (void)
- {
- plugin_register_complex_config ("apache", config);
-+ plugin_register_init ("apache", apache_init);
- } /* void module_register */
-
- /* vim: set sw=8 noet fdm=marker : */
diff a/src/curl.c b/src/curl.c
--- a/src/curl.c
+++ b/src/curl.c