From 81718c9d09a3be92fe37fa0ed0f2254d5e65eeb2 Mon Sep 17 00:00:00 2001
From: gggeek <giunta.gaetano@gmail.com>
Date: Sat, 9 Jan 2021 18:34:31 +0000
Subject: [PATCH] allow flexible charset decoding for polyfill-xmlrpc

---
 NEWS            |  4 +++-
 src/Encoder.php | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index f3caf81..0ff0d6d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-XML-RPC for PHP version 4.5.2 - unreleased
+XML-RPC for PHP version 4.5.2 - 2021/1/9
 
 * improved: better phpdocs in the the php code generated by the Wrapper class
 
@@ -6,6 +6,8 @@ XML-RPC for PHP version 4.5.2 - unreleased
 
 * improved: debugger favicon and page title when used from the phpjsonrpc library
 
+* fixed: allow `Encoder::decode` to properly support different target character sets for polyfill-xmlrpc decode functions
+
 
 XML-RPC for PHP version 4.5.1 - 2021/1/3
 
diff --git a/src/Encoder.php b/src/Encoder.php
index d352831..ecb64bd 100644
--- a/src/Encoder.php
+++ b/src/Encoder.php
@@ -54,8 +54,17 @@ class Encoder
                                 'scalar' => $val
                             );
                             return (object)$xmlrpcVal;
+                        case 'string':
+                            if (isset($options['extension_api_encoding'])) {
+                                $dval = @iconv('UTF-8', $options['extension_api_encoding'], $val);
+                                if ($dval !== false) {
+                                    return $dval;
+                                }
+                            }
+                            //return $val;
+                            // break through voluntarily
                         default:
-                            return $xmlrpcVal->scalarval();
+                            return $val;
                     }
                 }
                 if (in_array('dates_as_objects', $options) && $xmlrpcVal->scalartyp() == 'dateTime.iso8601') {
@@ -279,6 +288,7 @@ class Encoder
 
         // What if internal encoding is not in one of the 3 allowed? We use the broadest one, ie. utf8!
         if (!in_array(PhpXmlRpc::$xmlrpc_internalencoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII'))) {
+            /// @todo emit a warning
             $parserOptions = array(XML_OPTION_TARGET_ENCODING => 'UTF-8');
         } else {
             $parserOptions = array(XML_OPTION_TARGET_ENCODING => PhpXmlRpc::$xmlrpc_internalencoding);
-- 
2.43.0