clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source
This commit is contained in:
Nikita Popov 2014-07-02 22:33:57 +02:00
commit 8c4156ed28
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -9,8 +9,9 @@ PHP NEWS
match). (Bob)
. Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
(Ferenc)
. Fixed buf #67497 (eval with parse error causes segmentation fault in
. Fixed bug #67497 (eval with parse error causes segmentation fault in
generator). (Nikita)
. Fixed bug #67151 (strtr with empty array crashes). (Nikita)
- CLI server:
. Implemented FR #67429 (CLI server is missing some new HTTP response codes).

4
ext/standard/string.c
View File

@ -3106,6 +3106,10 @@ static void php_strtr_array(zval *return_value, char *str, int slen, HashTable *
int patterns_len;
zend_llist *allocs;
if (zend_hash_num_elements(pats) == 0) {
RETURN_STRINGL(str, slen, 1);
}
S(&text) = str;
L(&text) = slen;