moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

curl_setup: Ensure no more than one IDN lib is enabled

Browse Source 
Prior to this change it was possible for libcurl to be built with both
Windows' native IDN lib (normaliz) and libidn2 enabled. It appears that
doesn't offer any benefit --and could cause a bug-- since libcurl's IDN
handling is written to use either one but not both.

Bug: https://github.com/curl/curl/issues/1441#issuecomment-297689856
Reported-by: Gisle Vanem
This commit is contained in:
Jay Satiro 2017-05-01 13:44:39 -04:00
parent 0912a5c760
commit 499a7288fe
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/curl_setup.h
View File

@ -588,11 +588,15 @@ int netware_init(void);
#endif #endif
#endif #endif
#if defined(HAVE_LIBIDN2) && defined(HAVE_IDN2_H) #if defined(HAVE_LIBIDN2) && defined(HAVE_IDN2_H) && !defined(USE_WIN32_IDN)
/* The lib and header are present */ /* The lib and header are present */
#define USE_LIBIDN2 #define USE_LIBIDN2
#endif #endif
#if defined(USE_LIBIDN2) && defined(USE_WIN32_IDN)
#error "Both libidn2 and WinIDN are enabled, choose one."
#endif
#ifndef SIZEOF_TIME_T #ifndef SIZEOF_TIME_T
/* assume default size of time_t to be 32 bit */ /* assume default size of time_t to be 32 bit */
#define SIZEOF_TIME_T 4 #define SIZEOF_TIME_T 4