mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
IDN: Gisle Vanem made the win32 version handle a missing CHARSET environment
and then figure it out with a suitable windows call.
This commit is contained in:
parent
fbe1fa9dcc
commit
877f16e5a5
28
lib/easy.c
28
lib/easy.c
@ -66,7 +66,7 @@
|
|||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif /* WIN32 ... */
|
||||||
|
|
||||||
#include "urldata.h"
|
#include "urldata.h"
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
@ -138,6 +138,28 @@ static CURLcode win32_init(void) { return CURLE_OK; }
|
|||||||
static void win32_cleanup(void) { }
|
static void win32_cleanup(void) { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_LIBIDN
|
||||||
|
/*
|
||||||
|
* Initialise use of IDNA library.
|
||||||
|
* It falls back to ASCII if $CHARSET isn't defined. This doesn't work for
|
||||||
|
* idna_to_ascii_lz().
|
||||||
|
*/
|
||||||
|
static void idna_init (void)
|
||||||
|
{
|
||||||
|
#ifdef WIN32
|
||||||
|
char buf[60];
|
||||||
|
UINT cp = GetACP();
|
||||||
|
|
||||||
|
if (!getenv("CHARSET") && cp > 0) {
|
||||||
|
snprintf(buf, sizeof(buf), "CHARSET=cp%u", cp);
|
||||||
|
putenv(buf);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
/* to do? */
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif /* USE_LIBIDN */
|
||||||
|
|
||||||
/* true globals -- for curl_global_init() and curl_global_cleanup() */
|
/* true globals -- for curl_global_init() and curl_global_cleanup() */
|
||||||
static unsigned int initialized = 0;
|
static unsigned int initialized = 0;
|
||||||
static long init_flags = 0;
|
static long init_flags = 0;
|
||||||
@ -163,6 +185,10 @@ CURLcode curl_global_init(long flags)
|
|||||||
return CURLE_FAILED_INIT;
|
return CURLE_FAILED_INIT;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_LIBIDN
|
||||||
|
idna_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
initialized = 1;
|
initialized = 1;
|
||||||
init_flags = flags;
|
init_flags = flags;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user