svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mbstring/mbstring.c branches/PHP_5_3/ext/mbstring/tests/bug52931.phpt
trunk/ext/mbstring/mbstring.c trunk/ext/mbstring/tests/bug52931.phpt

felipe Mon, 27 Sep 2010 23:09:00 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=303805 Log: - Fixed bug #52931 (strripos not overloaded with function overloading enabled) Bug: http://bugs.php.net/52931 (Open) strripos not overloaded with function overloading enabled Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c A php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug52931.phpt U php/php-src/trunk/ext/mbstring/mbstring.c A php/php-src/trunk/ext/mbstring/tests/bug52931.phpt Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-09-27 23:05:33 UTC (rev 303804) +++ php/php-src/branches/PHP_5_3/NEWS 2010-09-27 23:09:00 UTC (rev 303805) @@ -21,6 +21,8 @@ - Fixed possible crash in mssql_fetch_batch(). (Kalle) - Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat) +- Fixed bug #52931 (strripos not overloaded with function overloading enabled). + (Felipe) - Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with large amount of data). (Adam) - Fixed bug #52926 (zlib fopen wrapper does not use context). (Gustavo) Modified: php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c 2010-09-27 23:05:33 UTC (rev 303804) +++ php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c 2010-09-27 23:09:00 UTC (rev 303805) @@ -196,7 +196,7 @@ {MB_OVERLOAD_STRING, "strpos", "mb_strpos", "mb_orig_strpos"}, {MB_OVERLOAD_STRING, "strrpos", "mb_strrpos", "mb_orig_strrpos"}, {MB_OVERLOAD_STRING, "stripos", "mb_stripos", "mb_orig_stripos"}, - {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_stripos"}, + {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_strripos"}, {MB_OVERLOAD_STRING, "strstr", "mb_strstr", "mb_orig_strstr"}, {MB_OVERLOAD_STRING, "strrchr", "mb_strrchr", "mb_orig_strrchr"}, {MB_OVERLOAD_STRING, "stristr", "mb_stristr", "mb_orig_stristr"}, Added: php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug52931.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug52931.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug52931.phpt 2010-09-27 23:09:00 UTC (rev 303805) @@ -0,0 +1,22 @@ +--TEST-- +Bug #52931 (strripos not overloaded with function overloading enabled) +--INI-- +mbstring.func_overload = 7 +mbstring.internal_encoding = utf-8 +--FILE-- +<?php + +$string = '<body>Umlauttest öüä</body>'; + +var_dump(strlen($string)); +var_dump(mb_strlen($string)); + +var_dump(strripos($string, '</body>')); +var_dump(mb_strripos($string, '</body>')); + +?> +--EXPECTF-- +int(27) +int(27) +int(20) +int(20) Property changes on: php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug52931.phpt ___________________________________________________________________ Added: svn:keywords + Id Rev Revision Added: svn:eol-style + native Modified: php/php-src/trunk/ext/mbstring/mbstring.c =================================================================== --- php/php-src/trunk/ext/mbstring/mbstring.c 2010-09-27 23:05:33 UTC (rev 303804) +++ php/php-src/trunk/ext/mbstring/mbstring.c 2010-09-27 23:09:00 UTC (rev 303805) @@ -196,7 +196,7 @@ {MB_OVERLOAD_STRING, "strpos", "mb_strpos", "mb_orig_strpos"}, {MB_OVERLOAD_STRING, "strrpos", "mb_strrpos", "mb_orig_strrpos"}, {MB_OVERLOAD_STRING, "stripos", "mb_stripos", "mb_orig_stripos"}, - {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_stripos"}, + {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_strripos"}, {MB_OVERLOAD_STRING, "strstr", "mb_strstr", "mb_orig_strstr"}, {MB_OVERLOAD_STRING, "strrchr", "mb_strrchr", "mb_orig_strrchr"}, {MB_OVERLOAD_STRING, "stristr", "mb_stristr", "mb_orig_stristr"}, Added: php/php-src/trunk/ext/mbstring/tests/bug52931.phpt =================================================================== --- php/php-src/trunk/ext/mbstring/tests/bug52931.phpt (rev 0) +++ php/php-src/trunk/ext/mbstring/tests/bug52931.phpt 2010-09-27 23:09:00 UTC (rev 303805) @@ -0,0 +1,22 @@ +--TEST-- +Bug #52931 (strripos not overloaded with function overloading enabled) +--INI-- +mbstring.func_overload = 7 +mbstring.internal_encoding = utf-8 +--FILE-- +<?php + +$string = '<body>Umlauttest öüä</body>'; + +var_dump(strlen($string)); +var_dump(mb_strlen($string)); + +var_dump(strripos($string, '</body>')); +var_dump(mb_strripos($string, '</body>')); + +?> +--EXPECTF-- +int(27) +int(27) +int(20) +int(20) Property changes on: php/php-src/trunk/ext/mbstring/tests/bug52931.phpt ___________________________________________________________________ Added: svn:keywords + Id Rev Revision Added: svn:eol-style + native