From: Jay Satiro <raysatiro@yahoo.com>
Date: Fri, 14 Aug 2015 03:29:27 +0000 (-0400)
Subject: curl_global_init_mem.3: Stronger thread safety warning
X-Git-Tag: curl-7_45_0~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1b1ca606d91822502f2bad26e781aa5e0dcfa0;p=curl

curl_global_init_mem.3: Stronger thread safety warning

Bug: http://curl.haxx.se/mail/lib-2015-08/0016.html
Reported-by: Eric Ridge
---

diff --git a/docs/libcurl/curl_global_init_mem.3 b/docs/libcurl/curl_global_init_mem.3
index a21e63d8b..0e8c0fa55 100644
--- a/docs/libcurl/curl_global_init_mem.3
+++ b/docs/libcurl/curl_global_init_mem.3
@@ -36,12 +36,13 @@ This function works exactly as \fIcurl_global_init(3)\fP with one addition: it
 allows the application to set callbacks to replace the otherwise used internal
 memory functions.
 
-When you use this function, all callback arguments must be set to valid
-function pointers. \fBIf you are using libcurl from multiple threads or with
-the threaded resolver (the default in Windows) the callback replacement
-functions must be thread safe.\fP
+If you are using libcurl from multiple threads or libcurl was built with the
+threaded resolver option then the callback functions must be thread safe. The
+threaded resolver is a common build option to enable (and in some cases the
+default) so we strongly urge you to make your callback functions thread safe.
 
-The prototypes for the given callbacks should match these:
+All callback arguments must be set to valid function pointers. The
+prototypes for the given callbacks must match these:
 .IP "void *malloc_callback(size_t size);"
 To replace malloc()
 .IP "void free_callback(void *ptr);"