diff -r 5a6b6e770365 -r 68c69c656a2c web/lib/Zend/XmlRpc/Client.php --- a/web/lib/Zend/XmlRpc/Client.php Thu May 07 15:10:09 2015 +0200 +++ b/web/lib/Zend/XmlRpc/Client.php Thu May 07 15:16:02 2015 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -71,7 +71,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client @@ -257,9 +257,15 @@ { $this->_lastRequest = $request; - iconv_set_encoding('input_encoding', 'UTF-8'); - iconv_set_encoding('output_encoding', 'UTF-8'); - iconv_set_encoding('internal_encoding', 'UTF-8'); + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('input_encoding', 'UTF-8'); + iconv_set_encoding('output_encoding', 'UTF-8'); + iconv_set_encoding('internal_encoding', 'UTF-8'); + } else { + ini_set('input_encoding', 'UTF-8'); + ini_set('output_encoding', 'UTF-8'); + ini_set('default_charset', 'UTF-8'); + } $http = $this->getHttpClient(); if($http->getUri() === null) {