mirror of
https://github.com/php/php-src.git
synced 2026-03-26 17:22:15 +01:00
7fcd4064c0
* master: (41 commits)
fix test - output can be chunked
fix test
fix test
Fixed test for commit 997be125eb
Add bug fix to NEWS
Update UPGRADING according to bug fix
fix test
improve CURL tests to allow testing without separate server
improve CURL tests to allow testing without separate server
Fixed bug #67199 mb_regex_encoding mishmash
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
- Move checking
- Fixed missing NULL check in SimpleXMLElement::xpath()
- Fixed missing NULL check
...
Conflicts:
ext/bz2/bz2.c
ext/gd/gd.c
ext/mbstring/php_mbregex.c
ext/session/tests/031.phpt
ext/simplexml/simplexml.c
ext/spl/spl_fixedarray.c
!!Caution: DO NOT ADD/CHANGE MBSTRING CODE!! New mbstring is under development, anyone who would like add new feature/change behavior should access to development source. http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/php-i18n/ All changes made after 2002/5/19 are subject to be removed. You are warned in php-dev and php-cvs lists many times already. If you are curious, search archive for details. Thank you.