svn commit: r1934354 - apr/apr/trunk/misc/win32

[email protected] Mon, 18 May 2026 12:55:36 -0000
Newsgroups gmane.comp.apache.apr.cvs
Message-ID <177910893649.238495.9765979796347625850@svn03-he-fi>
Author: ivan
Date: Mon May 18 12:55:36 2026
New Revision: 1934354

Log:
win32: apr_os_default_encoding()/apr_os_locale_encoding(): return "UTF-8"
instead of "CP65001" if encoding is UTF-8.

This will make behavior more consistent with unix code.

* misc/win32/charset.c
  (encoding_from_codepage): Return "UTF-8" for CP_UTF8 (65001).

Modified:
   apr/apr/trunk/misc/win32/charset.c

Modified: apr/apr/trunk/misc/win32/charset.c
==============================================================================
--- apr/apr/trunk/misc/win32/charset.c	Mon May 18 12:47:37 2026	(r1934353)
+++ apr/apr/trunk/misc/win32/charset.c	Mon May 18 12:55:36 2026	(r1934354)
@@ -20,7 +20,12 @@
 
 static const char * encoding_from_codepage(DWORD codepage, apr_pool_t *pool)
 {
-    return apr_psprintf(pool, "CP%u", (unsigned)codepage);
+    if (codepage == CP_UTF8) {
+        return "UTF-8";
+    }
+    else {
+        return apr_psprintf(pool, "CP%u", (unsigned)codepage);
+    }
 }
 
 APR_DECLARE(const char*) apr_os_default_encoding (apr_pool_t *pool)