Muldersoft/cURL-build-win32
Muldersoft/cURL-build-win32
1
0
Fork 0
Code Issues Pull Requests Projects Releases 18 Wiki Activity

Small fix.

Browse Source
This commit is contained in:
LoRd_MuldeR 2021-06-13 17:14:29 +02:00
parent d738143779
commit 0cfe2b1d57
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patch/curl_url.diff
View File

@ -1,21 +1,7 @@
From 3592721ce7d81e1a1fbd8cedd5cd80863891daf7 Mon Sep 17 00:00:00 2001 diff --git "a/D:\\_Sandbox\\curl\\curl-x86\\lib\\url.c.orig" "b/D:\\_Sandbox\\curl\\curl-x86\\lib\\url.c"
From: Viktor Szakats <commit@vsz.me> index 1ee38af..99c7740 100644
Date: Fri, 11 Jun 2021 23:55:40 +0000 --- "a/lib/url.c"
Subject: [PATCH] idn: fix libidn2 with windows unicode builds +++ "b/lib/url.c"
Unicode Windows builds use UTF-8 strings internally in libcurl,
so make sure to call the UTF-8 flavour of the libidn2 API.
Reported-by: dEajL3kA on github
Fixes #7228
---
lib/url.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index edcdf54b1a07..ee1b4c29de51 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -62,6 +62,14 @@ @@ -62,6 +62,14 @@
#ifdef USE_LIBIDN2 #ifdef USE_LIBIDN2
#include <idn2.h> #include <idn2.h>
@ -31,7 +17,7 @@ index edcdf54b1a07..ee1b4c29de51 100644
#elif defined(USE_WIN32_IDN) #elif defined(USE_WIN32_IDN)
/* prototype for curl_win32_idn_to_ascii() */ /* prototype for curl_win32_idn_to_ascii() */
bool curl_win32_idn_to_ascii(const char *in, char **out); bool curl_win32_idn_to_ascii(const char *in, char **out);
@@ -1576,12 +1584,12 @@ CURLcode Curl_idnconvert_hostname(struct Curl_easy *data, @@ -1577,12 +1585,12 @@ CURLcode Curl_idnconvert_hostname(struct Curl_easy *data,
#else #else
int flags = IDN2_NFC_INPUT; int flags = IDN2_NFC_INPUT;
#endif #endif