diff options
| author | Thomas Punt <tpunt@php.net> | 2018-04-26 21:09:08 +0100 |
|---|---|---|
| committer | Thomas Punt <tpunt@php.net> | 2018-04-26 21:09:08 +0100 |
| commit | 972c4869a75eb3c5655f50c4d630160a6df4ee15 (patch) | |
| tree | 6ba5c458da8df7ca59f90a59ed8d3db549637620 /sapi | |
| parent | b3fff5fc412fa8f2e2243e7e625e7e3daf9639fb (diff) | |
| parent | 2513da4b4c3e7e49bbc01757692056c3e2630145 (diff) | |
| download | php-git-972c4869a75eb3c5655f50c4d630160a6df4ee15.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Allocate default ini values into persistent memory
Diffstat (limited to 'sapi')
| -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 ec4c4f2df5..64cb80df09 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) /* {{{ */ |