@@ -173,7 +173,7 @@ typedef struct _php_cgi_globals_struct {
173
173
#endif
174
174
HashTable user_config_cache ;
175
175
char * error_header ;
176
- char * fpm_conf ;
176
+ char * fpm_config ;
177
177
struct event_base * event_base ;
178
178
} php_cgi_globals_struct ;
179
179
@@ -1408,7 +1408,7 @@ PHP_INI_BEGIN()
1408
1408
STD_PHP_INI_ENTRY ("fastcgi.impersonate" , "0" , PHP_INI_SYSTEM , OnUpdateBool , impersonate , php_cgi_globals_struct , php_cgi_globals )
1409
1409
#endif
1410
1410
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 )
1412
1412
PHP_INI_END ()
1413
1413
1414
1414
/* {{{ php_cgi_globals_ctor
@@ -1428,7 +1428,7 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_
1428
1428
#endif
1429
1429
zend_hash_init (& php_cgi_globals -> user_config_cache , 0 , NULL , (dtor_func_t ) user_config_cache_entry_dtor , 1 );
1430
1430
php_cgi_globals -> error_header = NULL ;
1431
- php_cgi_globals -> fpm_conf = NULL ;
1431
+ php_cgi_globals -> fpm_config = NULL ;
1432
1432
}
1433
1433
/* }}} */
1434
1434
@@ -1750,7 +1750,7 @@ consult the installation file that came with this distribution, or visit \n\
1750
1750
}
1751
1751
}
1752
1752
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 ))) {
1754
1754
return FAILURE ;
1755
1755
}
1756
1756
0 commit comments