From 8fa3f7809a30753a6c6bbedaf243de7447d018f3 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 14 Jul 2020 08:30:17 +0000
Subject: windows: add unicode to feature list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Marcel Raad
Reviewed-by: Marc Hörsken

Closes #5491
---
 docs/libcurl/curl_version_info.3 | 3 +++
 docs/libcurl/symbols-in-versions | 1 +
 include/curl/curl.h              | 2 ++
 lib/version.c                    | 3 +++
 packages/OS400/curl.inc.in       | 2 ++
 src/tool_help.c                  | 1 +
 6 files changed, 12 insertions(+)

diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3
index 7a6a540ff..9be46f7bd 100644
--- a/docs/libcurl/curl_version_info.3
+++ b/docs/libcurl/curl_version_info.3
@@ -163,6 +163,9 @@ supports Kerberos V5 authentication for FTP, IMAP, POP3, SMTP and SOCKSv5 proxy
 (Added in 7.40.0)
 .IP CURL_VERSION_LARGEFILE
 libcurl was built with support for large files. (Added in 7.11.1)
+.IP CURL_VERSION_UNICODE
+libcurl was built with Unicode support on Windows. This makes non-ASCII
+characters work in filenames and options passed to libcurl. (Added in 7.72.0)
 .IP CURL_VERSION_LIBZ
 supports HTTP deflate using libz (Added in 7.10)
 .IP CURL_VERSION_MULTI_SSL
diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions
index 97224807c..63fc56b9f 100644
--- a/docs/libcurl/symbols-in-versions
+++ b/docs/libcurl/symbols-in-versions
@@ -970,6 +970,7 @@ CURL_VERSION_SSPI               7.13.2
 CURL_VERSION_TLSAUTH_SRP        7.21.4
 CURL_VERSION_UNIX_SOCKETS       7.40.0
 CURL_VERSION_ZSTD               7.72.0
+CURL_VERSION_UNICODE            7.72.0
 CURL_WAIT_POLLIN                7.28.0
 CURL_WAIT_POLLOUT               7.28.0
 CURL_WAIT_POLLPRI               7.28.0
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 9104828c3..5284cdc43 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -2843,6 +2843,8 @@ typedef struct curl_version_info_data curl_version_info_data;
 #define CURL_VERSION_ALTSVC       (1<<24) /* Alt-Svc handling built-in */
 #define CURL_VERSION_HTTP3        (1<<25) /* HTTP3 support built-in */
 #define CURL_VERSION_ZSTD         (1<<26) /* zstd features are present */
+#define CURL_VERSION_UNICODE      (1<<27) /* Unicode support on Windows */
+
  /*
  * NAME curl_version_info()
  *
diff --git a/lib/version.c b/lib/version.c
index 91fb092ae..4f6dda24f 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -390,6 +390,9 @@ static curl_version_info_data version_info = {
     ( (SIZEOF_OFF_T > 4) || defined(USE_WIN32_LARGE_FILES) )
   | CURL_VERSION_LARGEFILE
 #endif
+#if defined(WIN32) && defined(UNICODE) && defined(_UNICODE)
+  | CURL_VERSION_UNICODE
+#endif
 #if defined(CURL_DOES_CONVERSIONS)
   | CURL_VERSION_CONV
 #endif
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 5b3b2c059..33ac8b34b 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -140,6 +140,8 @@
      d                 c                   X'01000000'
      d CURL_VERSION_HTTP3...
      d                 c                   X'02000000'
+     d CURL_VERSION_UNICODE...
+     d                 c                   X'04000000'
       *
      d CURL_HTTPPOST_FILENAME...
      d                 c                   X'00000001'
diff --git a/src/tool_help.c b/src/tool_help.c
index f60681ced..0fc818d3c 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -537,6 +537,7 @@ static const struct feat feats[] = {
   {"IDN",            CURL_VERSION_IDN},
   {"IPv6",           CURL_VERSION_IPV6},
   {"Largefile",      CURL_VERSION_LARGEFILE},
+  {"Unicode",        CURL_VERSION_UNICODE},
   {"SSPI",           CURL_VERSION_SSPI},
   {"GSS-API",        CURL_VERSION_GSSAPI},
   {"Kerberos",       CURL_VERSION_KERBEROS5},
-- 
cgit v1.2.1