wez Thu Jun 16 11:36:40 2005 EDT
Modified files:
/php-src/ext/standard dl.c
Log:
Don't emit the E_STRICT dl-is-deprecated notice on SAPI's where dl() is
widely (and safely) used.
This allows our test-suite to run in E_STRICT mode.
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.99&r2=1.100&ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.99 php-src/ext/standard/dl.c:1.100
--- php-src/ext/standard/dl.c:1.99 Wed May 4 09:26:28 2005
+++ php-src/ext/standard/dl.c Thu Jun 16 11:36:39 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dl.c,v 1.99 2005/05/04 13:26:28 hyanantha Exp $ */
+/* $Id: dl.c,v 1.100 2005/06/16 15:36:39 wez Exp $ */
#include "php.h"
#include "dl.h"
@@ -63,24 +63,27 @@
convert_to_string_ex(file);
-#ifdef ZTS
+ if (!PG(enable_dl)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded
extensions aren't enabled");
+ RETURN_FALSE;
+ } else if (PG(safe_mode)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded
extensions aren't allowed when running in Safe Mode");
+ RETURN_FALSE;
+ }
+
if ((strncmp(sapi_module.name, "cgi", 3)!=0) &&
(strcmp(sapi_module.name, "cli")!=0) &&
(strncmp(sapi_module.name, "embed", 5)!=0)) {
+#ifdef ZTS
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in
multithreaded Web servers - use extension=%s in your php.ini",
Z_STRVAL_PP(file));
RETURN_FALSE;
- }
+#else
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, "dl() is deprecated
- use extension=%s in your php.ini", Z_STRVAL_PP(file));
#endif
-
- if (!PG(enable_dl)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded
extensions aren't enabled");
- } else if (PG(safe_mode)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded
extensions aren't allowed when running in Safe Mode");
- } else {
- zend_error(E_STRICT, "dl() is deprecated - use extension=%s in
your php.ini", Z_STRVAL_PP(file));
- php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC);
- EG(full_tables_cleanup) = 1;
}
+
+ php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC);
+ EG(full_tables_cleanup) = 1;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
