cvs: php4 /ext/standard dl.c

derick Sun Oct 13 10:14:34 2002 EDT Modified files: /php4/ext/standard dl.c Log: - Fixed bug #19885, dl() no longer gives a fatal error when a module could not be loaded. (Derick) Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.73 php4/ext/standard/dl.c:1.74 --- php4/ext/standard/dl.c:1.73 Thu Sep 5 17:12:55 2002 +++ php4/ext/standard/dl.c Sun Oct 13 10:14:34 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.73 2002/09/05 21:12:55 sniper Exp $ */ +/* $Id: dl.c,v 1.74 2002/10/13 14:14:34 derick Exp $ */ #include "php.h" #include "dl.h" @@ -66,7 +66,8 @@ #ifdef ZTS if ((strcmp(sapi_module.name, "cgi")!=0) && (strcmp(sapi_module.name, "cli")!=0)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Not supported in multithreaded Web servers - use extension statements in your php.ini"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in multithreaded Web servers - use extension statements in your php.ini"); + RETURN_FALSE; } #endif @@ -78,9 +79,9 @@ convert_to_string_ex(file); if (!PG(enable_dl)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Dynamically loaded extentions aren't enabled"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded extentions aren't enabled"); } else if (PG(safe_mode)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Dynamically loaded extensions aren't allowed when running in Safe Mode"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded extensions aren't allowed when running in Safe Mode"); } else { php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC); EG(full_tables_cleanup) = 1;