php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #52931 (strripos not overloaded with function overloading enabled)

Browse Source
This commit is contained in:
Felipe Pena
2010-09-27 23:09:00 +00:00
parent 761cc30055
commit 2cd1661e2d
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -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)

2
ext/mbstring/mbstring.c
View File

@@ -196,7 +196,7 @@ static const struct mb_overload_def mb_ovld[] = {
{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"},

22
ext/mbstring/tests/bug52931.phpt Normal file
View File

@@ -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)