Merge that nicer error message here too

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 322aefe3cd980663b75c6c2fe337f06b8a674718..bac40f3bdee51f5d41c8e012cc42614c37d3b223 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -60,22 +60,22 @@ PHP_FUNCTION(dl)
 {
        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");
        } else if (PG(safe_mode)) {