Re: [PHP4BETA] cvs: /php4/ext/standard dl.c

The test that optionally calls cfg_get_string() is redundant - if the extension_dir is given in the configuration file, it'll be updated automatically in PG(extension_dir). Zeev On Tue, 2 May 2000, Sascha Schumann wrote: > sas Tue May 2 07:44:08 2000 EDT > > Modified files: > /php4/ext/standard dl.c > Log: > Make php_dl() respect the configured extension_dir setting. > > > Index: php4/ext/standard/dl.c > diff -u php4/ext/standard/dl.c:1.36 php4/ext/standard/dl.c:1.37 > --- php4/ext/standard/dl.c:1.36 Mon Apr 24 08:40:07 2000 > +++ php4/ext/standard/dl.c Tue May 2 07:44:08 2000 > @@ -83,10 +83,11 @@ > 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); > > > > -- Zeev Suraski <zeev@zend.com> http://www.zend.com/