cvs: php-src(PHP_5_1) /ext/iconv/tests skipif.inc /ext/xml/tests bug32001.phpt

From: Date: Sun, 30 Oct 2005 18:07:47 +0000
Subject: cvs: php-src(PHP_5_1) /ext/iconv/tests skipif.inc /ext/xml/tests bug32001.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-34895@lists.php.net to get a copy of this message
iliaa Sun Oct 30 13:07:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/iconv/tests skipif.inc /php-src/ext/xml/tests bug32001.phpt Log: Improve iconv skip conditions http://cvs.php.net/diff.php/php-src/ext/iconv/tests/skipif.inc?r1=1.3&r2=1.3.18.1&ty=u Index: php-src/ext/iconv/tests/skipif.inc diff -u php-src/ext/iconv/tests/skipif.inc:1.3 php-src/ext/iconv/tests/skipif.inc:1.3.18.1 --- php-src/ext/iconv/tests/skipif.inc:1.3 Tue Oct 29 16:51:32 2002 +++ php-src/ext/iconv/tests/skipif.inc Sun Oct 30 13:07:46 2005 @@ -6,7 +6,7 @@ // $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so"; // @dl("iconv$dlext"); //} -if (!extension_loaded("iconv")) { - die("skip iconv extension not available\n"); +if (!function_exists("iconv")) { + die("skip iconv function not available\n"); } ?> \ No newline at end of file http://cvs.php.net/diff.php/php-src/ext/xml/tests/bug32001.phpt?r1=1.6&r2=1.6.2.1&ty=u Index: php-src/ext/xml/tests/bug32001.phpt diff -u php-src/ext/xml/tests/bug32001.phpt:1.6 php-src/ext/xml/tests/bug32001.phpt:1.6.2.1 --- php-src/ext/xml/tests/bug32001.phpt:1.6 Wed Jun 29 07:52:18 2005 +++ php-src/ext/xml/tests/bug32001.phpt Sun Oct 30 13:07:47 2005 @@ -2,7 +2,7 @@ Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect) --SKIPIF-- <?php - if (!extension_loaded('iconv')) print 'skip'; + if (!function_exists('iconv')) print 'skip'; ?> --FILE-- <?php

« previous php.cvs (#34895) next »