aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-02-02 16:24:41 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-02-02 16:24:41 +0000
commitc2967c3c39d5c5797bdd7fffa41b220cecce3786 (patch)
treec1fe64be10ac102cade11aa079d4a7b5740097b9 /lib
parent70d7a9e6a5cea1f51c5d8a71eec4fa08192fc0c2 (diff)
now provides c-ares version info in both version calls
Diffstat (limited to 'lib')
-rw-r--r--lib/version.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/version.c b/lib/version.c
index 3004fc17c..80abba4ea 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -29,6 +29,10 @@
#include <curl/curl.h>
#include "urldata.h"
+#ifdef USE_ARES
+#include <ares_version.h>
+#endif
+
#ifdef USE_SSLEAY
static void getssl_version(char *ptr, long *num)
{
@@ -118,6 +122,11 @@ char *curl_version(void)
sprintf(ptr, " GSS");
ptr += strlen(ptr);
#endif
+#ifdef USE_ARES
+ /* this function is only present in c-ares, not in the original ares */
+ sprintf(ptr, " c-ares/%s", ares_version(NULL));
+ ptr += strlen(ptr);
+#endif
return version;
}
@@ -159,7 +168,7 @@ static const char *protocols[] = {
};
static curl_version_info_data version_info = {
- CURLVERSION_FIRST,
+ CURLVERSION_SECOND,
LIBCURL_VERSION,
LIBCURL_VERSION_NUM,
OS, /* as found by configure or set by hand at build-time */
@@ -193,7 +202,8 @@ static curl_version_info_data version_info = {
NULL, /* ssl_version */
0, /* ssl_version_num */
NULL, /* zlib_version */
- protocols
+ protocols,
+ NULL, /* c-ares version */
};
curl_version_info_data *curl_version_info(CURLversion stamp)
@@ -212,6 +222,13 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
version_info.libz_version = zlibVersion();
/* libz left NULL if non-existing */
#endif
+#ifdef USE_ARES
+ {
+ int aresnum;
+ version_info.ares = ares_version(&aresnum);
+ version_info.ares_num = aresnum;
+ }
+#endif
(void)stamp; /* avoid compiler warnings, we don't use this */
return &version_info;