Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
This commit is contained in:
Anatoliy Belsky 2012-07-13 11:46:14 +02:00
commit d9d21b2037

View File

@ -2,6 +2,11 @@
Bug #52944 (segfault with zlib filter and corrupted data)
--SKIPIF--
<?php if (!extension_loaded("zlib")) print "skip"; ?>
<?php
include "func.inc";
if (substr(PHP_OS, 0, 3) == 'WIN' && version_compare(get_zlib_version(), '1.2.7') < 0) {
die('skip - only for zlib >= 1.2.7 on windows');
}
--INI--
allow_url_fopen=1
--FILE--