aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/curl_global_init.35
-rw-r--r--include/curl/curl.h12
2 files changed, 15 insertions, 2 deletions
diff --git a/docs/curl_global_init.3 b/docs/curl_global_init.3
index 228cd4c5e..26b50e643 100644
--- a/docs/curl_global_init.3
+++ b/docs/curl_global_init.3
@@ -8,7 +8,7 @@ curl_global_init - Global libcurl initialisation
.SH SYNOPSIS
.B #include <curl/curl.h>
.sp
-.BI "CURLcode curl_global_init(void);"
+.BI "CURLcode curl_global_init( " long flags " );"
.ad
.SH DESCRIPTION
This function should be called once (no matter how many threads or libcurl
@@ -17,6 +17,9 @@ sessions that'll be used) by every application that uses libcurl.
If this function hasn't been invoked when \fIcurl_easy_init\fP is called, it
will be done automatically by libcurl.
+The flags option should be set to zero. It will be used to tell libcurl what
+specific features it should \fBnot\fP init.
+
You must however \fBalways\fP use the \fIcurl_global_cleanup\fP function, as
that cannot be called automatically for you by libcurl.
.SH RETURN VALUE
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 42b2826e8..54d6ae3da 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -492,8 +492,18 @@ char *curl_version(void);
char *curl_escape(char *string, int length);
char *curl_unescape(char *string, int length);
+/* curl_global_init() should be invoked exactly once for each application that
+ uses libcurl */
+CURLcode curl_global_init(long flags);
+
+/* curl_global_cleanup() should be invoked exactly once for each application
+ that uses libcurl */
+void curl_global_cleanup(void);
+
+
+
/* This is the version number */
-#define LIBCURL_VERSION "7.7.4-pre2"
+#define LIBCURL_VERSION "7.7.4-pre3"
#define LIBCURL_VERSION_NUM 0x070704
/* linked-list structure for the CURLOPT_QUOTE option (and other) */