wez Tue May 25 09:25:22 2004 EDT
Modified files:
/php-src/ext/standard dl.c
Log:
Merge that nicer error message here too
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.93&r2=1.94&ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.93 php-src/ext/standard/dl.c:1.94
--- php-src/ext/standard/dl.c:1.93 Fri May 21 13:17:55 2004
+++ php-src/ext/standard/dl.c Tue May 25 09:25:22 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dl.c,v 1.93 2004/05/21 17:17:55 wez Exp $ */
+/* $Id: dl.c,v 1.94 2004/05/25 13:25:22 wez Exp $ */
#include "php.h"
#include "dl.h"
@@ -60,21 +60,21 @@
{
pval **file;
+ /* obtain arguments */
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_string_ex(file);
+
#ifdef ZTS
if ((strncmp(sapi_module.name, "cgi", 3)!=0) &&
(strcmp(sapi_module.name, "cli")!=0) &&
(strncmp(sapi_module.name, "embed", 5)!=0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "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=%s in your php.ini", Z_STRVAL_PP(file));
RETURN_FALSE;
}
#endif
-
- /* obtain arguments */
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(file);
if (!PG(enable_dl)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded
extensions aren't enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
