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_globals.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_globals.h')
| -rw-r--r-- | main/php_globals.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/php_globals.h b/main/php_globals.h index 6c796d2c76..889072bc11 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -161,6 +161,9 @@ struct _php_core_globals { #endif long max_input_nesting_level; zend_bool in_user_include; + + char *user_ini_filename; + long user_ini_cache_ttl; }; |