aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/version.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/version.c b/lib/version.c
index d2125a259..9e553673d 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -33,6 +33,10 @@
#include <ares_version.h>
#endif
+#ifdef USE_LIBIDN
+#include <stringprep.h>
+#endif
+
#ifdef USE_SSLEAY
static void getssl_version(char *ptr, long *num)
{
@@ -95,6 +99,7 @@ char *curl_version(void)
{
static char version[200];
char *ptr;
+ int len = sizeof(version);
strcpy(version, LIBCURL_NAME "/" LIBCURL_VERSION );
ptr=strchr(version, '\0');
@@ -105,6 +110,7 @@ char *curl_version(void)
ptr=strchr(version, '\0');
}
#endif
+ len -= strlen(version);
#ifdef HAVE_KRB4
sprintf(ptr, " krb4");
@@ -127,6 +133,10 @@ char *curl_version(void)
sprintf(ptr, " c-ares/%s", ares_version(NULL));
ptr += strlen(ptr);
#endif
+#ifdef USE_LIBIDN
+ sprintf(ptr, " libidn/%s", stringprep_check_version(NULL));
+ ptr += strlen(ptr);
+#endif
return version;
}
@@ -168,7 +178,7 @@ static const char *protocols[] = {
};
static curl_version_info_data version_info = {
- CURLVERSION_SECOND,
+ CURLVERSION_NOW,
LIBCURL_VERSION,
LIBCURL_VERSION_NUM,
OS, /* as found by configure or set by hand at build-time */
@@ -201,6 +211,9 @@ static curl_version_info_data version_info = {
#if defined(ENABLE_64BIT) && (SIZEOF_CURL_OFF_T > 4)
| CURL_VERSION_LARGEFILE
#endif
+#ifdef USE_LIBIDN
+ | CURL_VERSION_IDN
+#endif
,
NULL, /* ssl_version */
0, /* ssl_version_num */
@@ -208,6 +221,7 @@ static curl_version_info_data version_info = {
protocols,
NULL, /* c-ares version */
0, /* c-ares version numerical */
+ NULL, /* libidn version */
};
curl_version_info_data *curl_version_info(CURLversion stamp)