diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-09-19 20:33:12 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-09-19 20:33:12 +0000 |
| commit | 7d14dad02ea58db34594e91f759424c51071c5a8 (patch) | |
| tree | 95a32d750a5c9b0e626bfbe4d02ebd5f4609a53b /main | |
| parent | 2332e4f9fc134b2ddec3779bcaf1ea237631b7c2 (diff) | |
| download | php-git-7d14dad02ea58db34594e91f759424c51071c5a8.tar.gz | |
MFH: Fixed mess with CGI/CLI -d command line option (now it works with cgi; constants are working exactly like in php.ini; with FastCGI -d affects all requests).
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.c | 1 | ||||
| -rw-r--r-- | main/SAPI.h | 2 | ||||
| -rw-r--r-- | main/php_ini.c | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 5bd12b13e9..c23357c65d 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -76,6 +76,7 @@ SAPI_API sapi_module_struct sapi_module; SAPI_API void sapi_startup(sapi_module_struct *sf) { + sf->ini_entries = NULL; sapi_module = *sf; #ifdef ZTS diff --git a/main/SAPI.h b/main/SAPI.h index 281a8e3f5d..7a4da0528e 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -257,6 +257,8 @@ struct _sapi_module_struct { void (*ini_defaults)(HashTable *configuration_hash); int phpinfo_as_text; + + char *ini_entries; }; diff --git a/main/php_ini.c b/main/php_ini.c index 92f2a4dda0..d88c87dbab 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -529,6 +529,11 @@ int php_init_config(TSRMLS_D) zend_llist_destroy(&scanned_ini_list); } } + + if (sapi_module.ini_entries) { + zend_parse_ini_string(sapi_module.ini_entries, 1, php_config_ini_parser_cb, &extension_lists); + } + return SUCCESS; } /* }}} */ |