diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-07-13 11:46:14 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-07-13 11:46:14 +0200 |
| commit | d9d21b20379850f7cc73dd8a7c728a918cb2fafa (patch) | |
| tree | 30fd64593d2c619d89b04999373a8ff399abd0f9 | |
| parent | cf91b163e1c16cfc0f6e4cd2b3ec78d82bc3ba1c (diff) | |
| parent | 02b8362ec231edb5be2a4ff633ad609c70713131 (diff) | |
| download | php-git-d9d21b20379850f7cc73dd8a7c728a918cb2fafa.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
| -rw-r--r-- | ext/zlib/tests/bug_52944.phpt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/zlib/tests/bug_52944.phpt b/ext/zlib/tests/bug_52944.phpt index 850371190e..c090fe6f5c 100644 --- a/ext/zlib/tests/bug_52944.phpt +++ b/ext/zlib/tests/bug_52944.phpt @@ -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--
|