From: Zeev Suraski <zeev@php.net>
Date: Sun, 5 Nov 2000 15:03:41 +0000 (+0000)
Subject: Fix the problem Sascha reported, about extension_dir
X-Git-Tag: php-4.0.4RC3~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f9ee4857bc7513c094daee7894aa5930db40db2;p=php

Fix the problem Sascha reported, about extension_dir
@- Fixed a bug that prevented a changed compile-time extension_dir from
@  affecting modules that were loaded via php.ini (Zeev)
---

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index e2b37ff2e2..5122f890c5 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -100,9 +100,9 @@ void php_dl(pval *file, int type, pval *return_value)
 
 
 	if (type==MODULE_PERSISTENT) {
-		/* Use the configuration hash directly */
+		/* Use the configuration hash directly, the INI mechanism is not yet initialized */
 		if (cfg_get_string("extension_dir", &extension_dir)==FAILURE) {
-			extension_dir = NULL;
+			extension_dir = PHP_EXTENSION_DIR;
 		}
 	} else {
 		extension_dir = PG(extension_dir);