delta/php-git.git/ext/zlib, branch php-5.5.18 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2014-08-21T20:43:25+00:00 Michael Wallner mike@php.net 2014-08-21T20:42:14+00:00 c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53 * PHP-5.4: fix bug #67865 
* PHP-5.4:
  fix bug #67865
fix bug #67865 2014-08-21T20:41:36+00:00 Michael Wallner mike@php.net 2014-08-21T20:41:36+00:00 54fbbded372b771cf281a73e1981cde642107924 






Merge branch 'PHP-5.4' into PHP-5.5
2014-08-06T12:27:56+00:00

Andrey Hristov
andrey@php.net

2014-08-06T12:27:56+00:00

41e1ccefd560a3472ba9230b226f14276bdde58d

Conflicts:
	NEWS
	configure.in
	main/php_version.h





Conflicts:
	NEWS
	configure.in
	main/php_version.h







Fixed Bug #67724
2014-08-05T13:44:43+00:00

Michael Wallner
mike@php.net

2014-08-05T13:44:43+00:00

e4ff7f2ee346d641715694209e61704c9e815483

(chained zlib filters silently fail with large amounts of data)

Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data





(chained zlib filters silently fail with large amounts of data)

Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data







Test output relies on expose_php being on
2014-07-14T14:21:11+00:00

Rasmus Lerdorf
rasmus@php.net

2014-07-11T17:59:02+00:00

275e41cb1289b2c1bea4d25dc6fabc726bb28a63












Merge branch 'PHP-5.4' into PHP-5.5
2014-06-08T20:50:41+00:00

Stanislav Malyshev
stas@php.net

2014-06-08T20:50:41+00:00

da6abc8db4de42cb8dd4b6c7e13bce339c4b320f

* PHP-5.4:
  Remove superfluous echos.





* PHP-5.4:
  Remove superfluous echos.







Remove superfluous echos.
2014-06-08T20:50:22+00:00

Jeff Welch
whatthejeff@gmail.com

2014-06-08T08:09:14+00:00

5fd7c2b01ddfcf932f364dc7065e7b0dd492655e












Bump year
2014-01-03T03:06:16+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:06:16+00:00

47c902777297ce895aa915c13efdb00881af3669












Bump year
2014-01-03T03:04:26+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:04:26+00:00

c0d060f5c02db168f1de895b41afffbc6e3cacfb












Merge branch 'PHP-5.4' into PHP-5.5
2013-11-06T09:46:34+00:00

Ferenc Kovacs
tyra3l@gmail.com

2013-11-06T09:46:34+00:00

91108818e1554ed542a13148e6d8b79e29e77935

Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt





Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt