diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-09-09 04:33:28 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-09-09 04:33:28 +0200 |
| commit | 502b70c50ca1b6be241569430b49293d6e302d4b (patch) | |
| tree | 6a8cb8db565e4fa47b69d0691462be493476db0a | |
| parent | 7c8798834aefe4d4071eb66020e7dfa47111e343 (diff) | |
| parent | 71da4f1f7f6b2ea51f85f2795f8297ba4fa720cb (diff) | |
| download | php-git-502b70c50ca1b6be241569430b49293d6e302d4b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Skip test for old glibc iconv
| -rw-r--r-- | ext/xml/tests/bug32001.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt index b5d2a7b0bd..2e9e67d4ca 100644 --- a/ext/xml/tests/bug32001.phpt +++ b/ext/xml/tests/bug32001.phpt @@ -4,6 +4,8 @@ Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect), <?php require_once("skipif.inc"); if (!extension_loaded('iconv')) die ("skip iconv extension not available"); +if (ICONV_IMPL == 'glibc' && version_compare(ICONV_VERSION, '2.12', '<=')) + die("skip iconv of glibc <= 2.12 is buggy"); ?> --FILE-- <?php |