cvs: php4 / NEWS /ext/standard dl.c

zeev Mon Jun 26 11:27:12 2000 EDT Modified files: /php4 NEWS /php4/ext/standard dl.c Log: - Disabled dl() when PHP is being used as a module inside a multithreaded web server - it didn't work before, and caused weird results (Zeev) Index: php4/NEWS diff -u php4/NEWS:1.324 php4/NEWS:1.325 --- php4/NEWS:1.324 Mon Jun 26 06:22:19 2000 +++ php4/NEWS Mon Jun 26 11:27:12 2000 @@ -1,7 +1,9 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -25 Jun 2000, Version 4.0.1 +28 Jun 2000, Version 4.0.1 +- Disabled dl() when PHP is being used as a module inside a multithreaded web + server - it didn't work before, and caused weird results (Zeev) - Added the ImageColorClosestHWB(), ImageCopyMerge() and ImagePaletteCopy() functions. (Sterling) - Added ImageCreateFromWBMP() function. (Jouni) Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.45 php4/ext/standard/dl.c:1.46 --- php4/ext/standard/dl.c:1.45 Mon Jun 12 14:01:03 2000 +++ php4/ext/standard/dl.c Mon Jun 26 11:27:12 2000 @@ -22,6 +22,7 @@ #include "dl.h" #include "php_globals.h" #include "ext/standard/info.h" +#include "SAPI.h" #ifdef HAVE_LIBDL #include <stdlib.h> @@ -50,6 +51,12 @@ { pval **file; PLS_FETCH(); + +#ifdef ZTS + if (strcmp(sapi_module.name, "cgi")!=0) { + php_error(E_ERROR, "dl() is not supported in multithreaded Web servers - use extension statements in your php.ini"); + } +#endif /* obtain arguments */ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {