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
..
tests	bz2 changes for phpng	2014-05-08 13:14:19 +01:00
bz2_filter.c	Finish bz2 (all tests passed)	2014-05-08 22:59:17 +08:00
bz2.c	Merge branch 'master' into phpng	2014-05-13 15:24:40 +04:00
bz2.dsp	revert change #298288: Remove old dsp/dsw/makefile files	2010-04-28 14:41:51 +00:00
config.m4	Fix long-standing visual pain point: the misalignment of './configure help' text.	2013-08-06 11:06:09 -07:00
config.w32	- check for static lib as well	2009-06-10 15:44:51 +00:00
CREDITS	add bzip2 extension to pecl from php5 cvs	2003-05-17 14:27:07 +00:00
package.xml	"The Visa to Sibiria" (work in progress)	2004-03-23 19:46:10 +00:00
php_bz2.def	Export symbols needed by bz2_filter	2004-04-13 17:54:47 +00:00
php_bz2.h	Bump year	2014-01-03 11:08:10 +08:00