diff options
| author | Jani Taskinen <jani@php.net> | 2007-09-28 02:05:10 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-09-28 02:05:10 +0000 |
| commit | 09b6f37f20b239dd021c21a1756629c4a64dc2da (patch) | |
| tree | 635d42eb3591448faedff41f62ce0fff087ea467 /main/php_ini.h | |
| parent | 0d3bdf23d24ede05b07d613d030514861ab475e5 (diff) | |
| download | php-git-09b6f37f20b239dd021c21a1756629c4a64dc2da.tar.gz | |
MFH:
- Added ".htaccess" style user-defined php.ini files support for
CGI/FastCGI.
- Added support for special [PATH=/opt/httpd/www.example.com/] sections
in php.ini. All directives set in these sections will not be able to be
overridden in user-defined ini-files or during runtime in the specified
path.
- Improved php.ini handling:
. Added better error reporting for syntax errors in php.ini files
. Allowed "ini-variables" to be used almost everywhere ini php.ini files
. Allowed using alphanumeric/variable indexes in "array" ini options
. Fixed get_cfg_var() to be able to return "array" ini options
- Fixed bug #27372 (parse error loading browscap.ini at apache startup)
- Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
characters)
Diffstat (limited to 'main/php_ini.h')
| -rw-r--r-- | main/php_ini.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/php_ini.h b/main/php_ini.h index a2b3125c3a..9034a9cce2 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -24,6 +24,7 @@ #include "zend_ini.h" BEGIN_EXTERN_C() +void config_zval_dtor(zval *zvalue); int php_init_config(TSRMLS_D); int php_shutdown_config(void); void php_ini_register_extensions(TSRMLS_D); @@ -31,6 +32,12 @@ PHPAPI zval *cfg_get_entry(char *name, uint name_length); PHPAPI int cfg_get_long(char *varname, long *result); PHPAPI int cfg_get_double(char *varname, double *result); PHPAPI int cfg_get_string(char *varname, char **result); +PHPAPI int php_parse_user_ini_file(char *dirname, char *ini_filename, HashTable *target_hash TSRMLS_DC); +PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage TSRMLS_DC); +PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC); +#if ZEND_DEBUG +PHPAPI HashTable get_configuration_hash(void); +#endif END_EXTERN_C() #define PHP_INI_USER ZEND_INI_USER |