generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simon Josefsson added a idn_free() function in libidn 0.4.5 as a reaction to

Browse Source 
Gisle's previous mail. We now use this function, and thus we require libidn
 0.4.5 or later. No earler version will do.
This commit is contained in:
Daniel Stenberg
2004-05-24 07:40:00 +00:00
parent 59f904d8de
commit 24420c2191
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/version.c
View File

@@ -132,8 +132,10 @@ char *curl_version(void)
ptr += strlen(ptr);
#endif
#ifdef USE_LIBIDN
sprintf(ptr, " libidn/%s", stringprep_check_version(NULL));
ptr += strlen(ptr);
if(stringprep_check_version(LIBIDN_REQUIRED_VERSION)) {
sprintf(ptr, " libidn/%s", stringprep_check_version(NULL));
ptr += strlen(ptr);
}
#endif
return version;
@@ -208,9 +210,6 @@ static curl_version_info_data version_info = {
#endif
#if defined(ENABLE_64BIT) && (SIZEOF_CURL_OFF_T > 4)
| CURL_VERSION_LARGEFILE
#endif
#ifdef USE_LIBIDN
| CURL_VERSION_IDN
#endif
,
NULL, /* ssl_version */
@@ -244,6 +243,13 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
version_info.ares = ares_version(&aresnum);
version_info.ares_num = aresnum;
}
#endif
#ifdef USE_LIBIDN
/* This returns a version string if we use the given version or later,
otherwise it returns NULL */
version_info.libidn = stringprep_check_version(LIBIDN_REQUIRED_VERSION);
if(version_info.libidn)
version_info.features |= CURL_VERSION_IDN;
#endif
(void)stamp; /* avoid compiler warnings, we don't use this */