diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-12 10:32:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-12 10:36:40 +0200 |
| commit | 824541d57ecf5514b55b98e392e9d1c30eb38764 (patch) | |
| tree | 503c2f6e87f3d2ce7e918392026bad30365dc4e0 /sapi/phpdbg/phpdbg.c | |
| parent | 1e9a5c67ef6d075df16d4183abf62e4c99b2f8c6 (diff) | |
| download | php-git-824541d57ecf5514b55b98e392e9d1c30eb38764.tar.gz | |
Disable report_zend_debug by default
We might just want to drop this completely, but at least don't
enable it by default. It already gets disabled by a number of
SAPIs, but we should make that the default state.
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index c0db5feda5..d817349941 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1062,17 +1062,6 @@ const char phpdbg_ini_hardcoded[] = "error_log=\n" "output_buffering=off\n\0"; -/* overwritable ini defaults must be set in phpdbg_ini_defaults() */ -#define INI_DEFAULT(name, value) \ - ZVAL_NEW_STR(&tmp, zend_string_init(value, sizeof(value) - 1, 1)); \ - zend_hash_str_update(configuration_hash, name, sizeof(name) - 1, &tmp); - -void phpdbg_ini_defaults(HashTable *configuration_hash) /* {{{ */ -{ - zval tmp; - INI_DEFAULT("report_zend_debug", "0"); -} /* }}} */ - static void phpdbg_welcome(zend_bool cleaning) /* {{{ */ { /* print blurb */ @@ -1567,7 +1556,7 @@ phpdbg_main: phpdbg->name = sapi_name; } - phpdbg->ini_defaults = phpdbg_ini_defaults; + phpdbg->ini_defaults = NULL; phpdbg->phpinfo_as_text = 1; phpdbg->php_ini_ignore_cwd = 1; |