Re: Re: svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fpm_main.c

Le 29 mars 2010 13:11, Pierre Joye <pierre.php@gmail.com> a écrit : > hi, > > I would suggest to call it fpm.configuration_path if it looks for the > file it self there, or fpm.configuration_dir if it looks in this path > for the conf file(s), that's actually explicit :) as discuss with tony, I changed that to fpm.config. We though it was explicit enough. ++ Jerome > > Cheers, > > 2010/3/29 Jérôme Loyet <fat@php.net>: >> fat                                      Mon, 29 Mar 2010 10:45:28 +0000 >> >> Revision: >> http://svn.php.net/viewvc?view=revision&revision=297061 >> >> Log: >> Add fpm.conf directive to global php.ini configuration file. It's used to specify >> where to find the FPM configuration file. By default it's not set and the -y runtime switch has >> priority. If neither fpm.conf or -y is used, FPM will try the default path >> PHP_SYSCONFDIR/php-fpm.conf. >> >> TODO: add "; fpm.conf = PHP_SYSCONFDIR/php-fpm.conf" to php.ini with additional >> documentation. It has to be done when FPM will be included into the trunk. >> >> Changed paths: >>    U   php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c >> >> Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c >> =================================================================== >> --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c    2010-03-29 10:40:22 UTC >> (rev 297060) >> +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c    2010-03-29 10:45:28 UTC >> (rev 297061) >> @@ -173,6 +173,7 @@ >>  #endif >>        HashTable user_config_cache; >>        char *error_header; >> +       char *fpm_conf; >>        struct event_base *event_base; >>  } php_cgi_globals_struct; >> >> @@ -1407,6 +1408,7 @@ >>        STD_PHP_INI_ENTRY("fastcgi.impersonate",     "0", >>  PHP_INI_SYSTEM, OnUpdateBool,   impersonate, php_cgi_globals_struct, php_cgi_globals) >>  #endif >>        STD_PHP_INI_ENTRY("fastcgi.error_header",    NULL, PHP_INI_SYSTEM, >> OnUpdateString, error_header, php_cgi_globals_struct, php_cgi_globals) >> +       STD_PHP_INI_ENTRY("fpm.conf",    NULL, PHP_INI_SYSTEM, >> OnUpdateString, fpm_conf, php_cgi_globals_struct, php_cgi_globals) >>  PHP_INI_END() >> >>  /* {{{ php_cgi_globals_ctor >> @@ -1426,6 +1428,7 @@ >>  #endif >>        zend_hash_init(&php_cgi_globals->user_config_cache, 0, NULL, >> (dtor_func_t) user_config_cache_entry_dtor, 1); >>        php_cgi_globals->error_header = NULL; >> +       php_cgi_globals->fpm_conf = NULL; >>  } >>  /* }}} */ >> >> @@ -1747,7 +1750,7 @@ >>                } >>        } >> >> -       if (0 > fpm_init(argc, argv, fpm_config, &CGIG(event_base))) { >> +       if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_conf), >> &CGIG(event_base))) { >>                return FAILURE; >>        } >> >> >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> > > > > -- > Pierre > > @pierrejoye | http://blog.thepimp.net | > http://www.libgd.org > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > >