diff --git a/ChangeLog b/ChangeLog index e99a325b8..250759444 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,13 @@ $Source$ * db_details_export.php3, db_details_links.php3, Documentation.html, sql.php3, tbl_properties_export.php3, libraries/common.lib.php3, libraries/select_lang.lib.php3: fixes from Loic + * config.inc.php3: default value for $cfg['AllowAnywhereRecoding'] = FALSE; + to avoid problems on multithreaded servers, thanks to Neil Darlow + (ndarlow) + * libraries/charset_conversion.lib.php3: remove the "@" before dl() + because multithreaded servers don't support dl(), and we want + to see the error message, thanks to /Leblanc + 2002-07-14 Marc Delisle * Documentation.html, db_details_exports.php3, tbl_properties_export.php3: diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php3 index b39a54723..a2257862f 100644 --- a/libraries/charset_conversion.lib.php3 +++ b/libraries/charset_conversion.lib.php3 @@ -12,6 +12,11 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){ /** * Loads the recode or iconv extensions if any of it is not loaded yet + * + * (do not put a "@" before the dl() because we want to see the error + * message: multithreaded web servers don't support dl() but we cannot + * detect if the server is multithreaded, and under PHP 4.2.1 at least, + * it reports that the function dl exists...) */ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] @@ -25,9 +30,9 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){ } else { $suffix = '.so'; } - @dl('recode' . $suffix); + dl('recode' . $suffix); if (!@extension_loaded('recode')) { - @dl('iconv' . $suffix); + dl('iconv' . $suffix); if (!@extension_loaded('iconv')) { echo $strCantLoadRecodeIconv; exit();