From 8eb698a847912735fa471ec8142ec95c4e33d598 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Tue, 2 May 2000 14:44:08 +0000 Subject: [PATCH] Make php_dl() respect the configured extension_dir setting. --- ext/standard/dl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/standard/dl.c b/ext/standard/dl.c index fed59b775af..f3a6195aa80 100644 --- 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);