diff options
| author | Thomas Punt <tpunt@php.net> | 2018-04-26 21:09:34 +0100 |
|---|---|---|
| committer | Thomas Punt <tpunt@php.net> | 2018-04-26 21:09:34 +0100 |
| commit | 31914a827e4fddef8b5f2e8614af651ae8c9361a (patch) | |
| tree | 5d6f9c51887d5ebebf2b166810f03b50bd4c28c8 /sapi/phpdbg | |
| parent | d08f1c5f5b5375f8207e71d0d4102eccd0d2ee1f (diff) | |
| parent | 972c4869a75eb3c5655f50c4d630160a6df4ee15 (diff) | |
| download | php-git-31914a827e4fddef8b5f2e8614af651ae8c9361a.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Allocate default ini values into persistent memory
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 1e0f44fcf2..a1fdc0cfe1 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1116,7 +1116,7 @@ const char phpdbg_ini_hardcoded[] = /* overwriteable ini defaults must be set in phpdbg_ini_defaults() */ #define INI_DEFAULT(name, value) \ - ZVAL_STRINGL(&tmp, value, sizeof(value) - 1); \ + 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) /* {{{ */ |