Commit a54cd54d authored by Mathieu Parent's avatar Mathieu Parent

Imported Upstream version 2.5.8

parent 7841381d
......@@ -827,9 +827,13 @@ class Horde_String
{
$text = strval($text);
// First check for illegal surrogate pair sequences. See RFC 3629.
if (preg_match('/\xE0[\x80-\x9F][\x80-\xBF]|\xED[\xA0-\xBF][\x80-\xBF]/S', $text)) {
return false;
}
for ($i = 0, $len = strlen($text); $i < $len; ++$i) {
$c = ord($text[$i]);
if ($c > 128) {
if ($c > 247) {
// STD 63 (RFC 3629) eliminates 5 & 6-byte characters.
......
<?xml version="1.0" encoding="UTF-8"?>
<package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>Horde_Util</name>
<channel>pear.horde.org</channel>
<extends>Util</extends>
......@@ -23,10 +23,10 @@
<email>slusarz@horde.org</email>
<active>yes</active>
</developer>
<date>2016-02-02</date>
<time>11:38:23</time>
<date>2016-07-01</date>
<time>17:10:51</time>
<version>
<release>2.5.7</release>
<release>2.5.8</release>
<api>2.5.0</api>
</version>
<stability>
......@@ -35,7 +35,7 @@
</stability>
<license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
<notes>
* [jan] Mark PHP 7 as supported.
* [mjr] Fix detecting certain types of broken UTF-8 strings.
</notes>
<contents>
<dir baseinstalldir="/" name="/">
......@@ -45,7 +45,7 @@
<file baseinstalldir="/" md5sum="2faf7b40042b99a6a5ea3240d89c1f7b" name="lib/Horde/String/Transliterate.php" role="php" />
<file baseinstalldir="/" md5sum="587c22ac7fcd6b25bd3b275ec91a8b7d" name="lib/Horde/Array.php" role="php" />
<file baseinstalldir="/" md5sum="f36ec7c21888acaf14914de224babcfb" name="lib/Horde/Domhtml.php" role="php" />
<file baseinstalldir="/" md5sum="50182187adad430aa48f6ff3a4bf40ba" name="lib/Horde/String.php" role="php" />
<file baseinstalldir="/" md5sum="1983a7a0dd9609dddabfc9c46532e244" name="lib/Horde/String.php" role="php" />
<file baseinstalldir="/" md5sum="99fde8b2cf2eaf9cafa0b9eff7c853a0" name="lib/Horde/Util.php" role="php" />
<file baseinstalldir="/" md5sum="d3a2ed6522a4c4cb9608be891fdc90fa" name="lib/Horde/Variables.php" role="php" />
<file baseinstalldir="/" md5sum="f3809b6e1d1babd90b612edf2bbe9410" name="test/Horde/Util/fixtures/domhtml_test.html" role="test" />
......@@ -820,5 +820,20 @@ Converted to package.xml 2.0 for pear.horde.org
* [jan] Mark PHP 7 as supported.
</notes>
</release>
<release>
<version>
<release>2.5.8</release>
<api>2.5.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2016-07-01</date>
<license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
<notes>
* [mjr] Fix detecting certain types of broken UTF-8 strings.
</notes>
</release>
</changelog>
</package>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment