Skip to content

Commit 997ff7a

Browse files
author
Jérôme Loyet
committed
As discuss with tony, change the fpm.conf directive to fpm.config which is much more explicit.
1 parent e3c3c42 commit 997ff7a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sapi/fpm/fpm/fpm_main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ typedef struct _php_cgi_globals_struct {
173173
#endif
174174
HashTable user_config_cache;
175175
char *error_header;
176-
char *fpm_conf;
176+
char *fpm_config;
177177
struct event_base *event_base;
178178
} php_cgi_globals_struct;
179179

@@ -1408,7 +1408,7 @@ PHP_INI_BEGIN()
14081408
STD_PHP_INI_ENTRY("fastcgi.impersonate", "0", PHP_INI_SYSTEM, OnUpdateBool, impersonate, php_cgi_globals_struct, php_cgi_globals)
14091409
#endif
14101410
STD_PHP_INI_ENTRY("fastcgi.error_header", NULL, PHP_INI_SYSTEM, OnUpdateString, error_header, php_cgi_globals_struct, php_cgi_globals)
1411-
STD_PHP_INI_ENTRY("fpm.conf", NULL, PHP_INI_SYSTEM, OnUpdateString, fpm_conf, php_cgi_globals_struct, php_cgi_globals)
1411+
STD_PHP_INI_ENTRY("fpm.config", NULL, PHP_INI_SYSTEM, OnUpdateString, fpm_config, php_cgi_globals_struct, php_cgi_globals)
14121412
PHP_INI_END()
14131413

14141414
/* {{{ php_cgi_globals_ctor
@@ -1428,7 +1428,7 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_
14281428
#endif
14291429
zend_hash_init(&php_cgi_globals->user_config_cache, 0, NULL, (dtor_func_t) user_config_cache_entry_dtor, 1);
14301430
php_cgi_globals->error_header = NULL;
1431-
php_cgi_globals->fpm_conf = NULL;
1431+
php_cgi_globals->fpm_config = NULL;
14321432
}
14331433
/* }}} */
14341434

@@ -1750,7 +1750,7 @@ consult the installation file that came with this distribution, or visit \n\
17501750
}
17511751
}
17521752

1753-
if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_conf), &CGIG(event_base))) {
1753+
if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), &CGIG(event_base))) {
17541754
return FAILURE;
17551755
}
17561756

0 commit comments

Comments
 (0)