Make php_dl() respect the configured extension_dir setting.

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index fed59b775af961b328d7ec02ff061304ec0ca116..f3a6195aa8089973ec56d59b6725e5d6efd0c299 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -83,10 +83,11 @@ void php_dl(pval *file,int type,pval *return_value)
        zend_module_entry *(*get_module)(void);
        PLS_FETCH();
        ELS_FETCH();
-       
-       if (cfg_get_string("extension_dir",&PG(extension_dir))==SUCCESS
-               && PG(extension_dir)
-               && PG(extension_dir)[0]){
+
+       if (!PG(extension_dir))
+               cfg_get_string("extension_dir",&PG(extension_dir));
+
+       if (PG(extension_dir) && PG(extension_dir)[0]){
                int extension_dir_len = strlen(PG(extension_dir));
 
                libpath = emalloc(extension_dir_len+file->value.str.len+2);