Dmitry Stogov 7fcd4064c0 Merge branch 'master' into phpng ... * 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		2014-05-13 15:24:40 +04:00
..
pcrelib	Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream	2014-05-09 22:15:54 +02:00
tests	Merge branch 'PHP-5.5' into PHP-5.6	2014-05-09 22:16:42 +02:00
config0.m4	merged PCRE 8.32	2013-03-03 19:06:22 +01:00
config.w32	merged PCRE 8.32	2013-03-03 19:06:22 +01:00
CREDITS
php_pcre.c	Nested PCRE calls may clobber extra->mark and it has to be reinitailized	2014-05-13 12:14:55 +04:00
php_pcre.def	Fix for bug 60986	2012-02-06 18:11:56 +00:00
php_pcre.h	Enable PCRE JIT compiler	2014-04-25 08:33:37 +04:00
upgrade-pcre.php	Update bundled PCRE to 8.12	2011-05-13 07:00:45 +00:00