iliaa Sun Oct 30 13:08:17 2005 EDT
Modified files:
/php-src/ext/iconv/tests skipif.inc
/php-src/ext/xml/tests bug32001.phpt
Log:
MFB51: Improve iconv skip conditions
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/skipif.inc?r1=1.3&r2=1.4&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.4
--- 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:08:17 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.7&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.7
--- 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:08:17 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
