helly Tue Oct 29 16:51:32 2002 EDT
Modified files:
/php4/ext/iconv/tests skipif.inc test.inc translit-utf8.phpt
Log:
-do not dl() load
-magic_quotes_runtime
Index: php4/ext/iconv/tests/skipif.inc
diff -u php4/ext/iconv/tests/skipif.inc:1.2 php4/ext/iconv/tests/skipif.inc:1.3
--- php4/ext/iconv/tests/skipif.inc:1.2 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/skipif.inc Tue Oct 29 16:51:32 2002
@@ -1,10 +1,11 @@
<?php
// This script prints "skip" if condition does not meet.
-if (!extension_loaded("iconv") && ini_get("enable_dl")) {
- $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
- @dl("iconv$dlext");
-}
+// Do not dl load extension
+//if (!extension_loaded("iconv") && ini_get("enable_dl")) {
+// $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
+// @dl("iconv$dlext");
+//}
if (!extension_loaded("iconv")) {
die("skip iconv extension not available\n");
}
Index: php4/ext/iconv/tests/test.inc
diff -u php4/ext/iconv/tests/test.inc:1.1 php4/ext/iconv/tests/test.inc:1.2
--- php4/ext/iconv/tests/test.inc:1.1 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/test.inc Tue Oct 29 16:51:32 2002
@@ -1,8 +1,7 @@
<?php
-// This script prints "skip" if condition does not meet.
-
-if (!extension_loaded("iconv") && ini_get("enable_dl")) {
- $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
- @dl("iconv$dlext");
-}
+// Do not dl load extension
+//if (!extension_loaded("iconv") && ini_get("enable_dl")) {
+// $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
+// @dl("iconv$dlext");
+//}
?>
Index: php4/ext/iconv/tests/translit-utf8.phpt
diff -u php4/ext/iconv/tests/translit-utf8.phpt:1.6
php4/ext/iconv/tests/translit-utf8.phpt:1.7
--- php4/ext/iconv/tests/translit-utf8.phpt:1.6 Tue Oct 29 11:25:23 2002
+++ php4/ext/iconv/tests/translit-utf8.phpt Tue Oct 29 16:51:32 2002
@@ -6,6 +6,7 @@
( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
?>
--INI--
+magic_quotes_runtime=0
error_reporting=2047
--FILE--
<?php // vim600: syn=php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
