sniper Fri Jul 29 09:25:33 2005 EDT
Modified files:
/php-src NEWS
/php-src/ext/standard dl.c
Log:
- Fixed bug #33899 (CLI: setting extension_dir=some/path extension=foobar.so
does not work)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2012&r2=1.2013&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2012 php-src/NEWS:1.2013
--- php-src/NEWS:1.2012 Fri Jul 29 08:58:24 2005
+++ php-src/NEWS Fri Jul 29 09:25:31 2005
@@ -2,6 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.1
- Fixed bug #33917 (number_format() output with > 1 char separators). (Jani)
+- Fixed bug #33899 (CLI: setting extension_dir=some/path extension=foobar.so
+ does not work). (Jani)
- Fixed bug #33882 (CLI was looking for php.ini in wrong path). (Hartmut)
- Fixed bug #33869 (strtotime() problem with "+1days" format). (Ilia)
- Fixed bug #33841 (pdo sqlite driver forgets to update affected column count
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.103&r2=1.104&ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.103 php-src/ext/standard/dl.c:1.104
--- php-src/ext/standard/dl.c:1.103 Mon Jul 18 12:20:08 2005
+++ php-src/ext/standard/dl.c Fri Jul 29 09:25:33 2005
@@ -18,12 +18,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dl.c,v 1.103 2005/07/18 16:20:08 dmitry Exp $ */
+/* $Id: dl.c,v 1.104 2005/07/29 13:25:33 sniper Exp $ */
#include "php.h"
#include "dl.h"
#include "php_globals.h"
+#include "php_ini.h"
#include "ext/standard/info.h"
+
#include "SAPI.h"
#if defined(HAVE_LIBDL) || HAVE_MACH_O_DYLD_H
@@ -108,16 +110,13 @@
int error_type;
char *extension_dir;
- if (type==MODULE_PERSISTENT) {
- /* Use the configuration hash directly, the INI mechanism is
not yet initialized */
- if (cfg_get_string("extension_dir", &extension_dir)==FAILURE) {
- extension_dir = PHP_EXTENSION_DIR;
- }
+ if (type == MODULE_PERSISTENT) {
+ extension_dir = INI_STR("extension_dir");
} else {
extension_dir = PG(extension_dir);
}
- if (type==MODULE_TEMPORARY) {
+ if (type == MODULE_TEMPORARY) {
error_type = E_WARNING;
} else {
error_type = E_CORE_WARNING;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
