diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:59:09 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:59:09 +0300 |
| commit | 8203a0668d1ec4d667336f8f3be469873d740911 (patch) | |
| tree | aff15fec48100625df5be1d87440f8f197a5ed97 /sapi | |
| parent | 49ea143bbd8d0bfcd393d0b5308a5d7833fc087c (diff) | |
| parent | cf67a421e986b1020dd390a694185039b131ba7c (diff) | |
| download | php-git-8203a0668d1ec4d667336f8f3be469873d740911.tar.gz | |
Merge branch 'master' into rc_debug
* master:
Use per-request heap instead of system one
Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
Makrk persistent resources and references with GC_PERSISTENT flag
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cli/php_cli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 52055c98c9..e7999febbb 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -593,17 +593,17 @@ static void cli_register_file_handles(void) /* {{{ */ php_stream_to_zval(s_err, &ec.value); ic.flags = CONST_CS; - ic.name = zend_string_init("STDIN", sizeof("STDIN")-1, 1); + ic.name = zend_string_init_interned("STDIN", sizeof("STDIN")-1, 0); ic.module_number = 0; zend_register_constant(&ic); oc.flags = CONST_CS; - oc.name = zend_string_init("STDOUT", sizeof("STDOUT")-1, 1); + oc.name = zend_string_init_interned("STDOUT", sizeof("STDOUT")-1, 0); oc.module_number = 0; zend_register_constant(&oc); ec.flags = CONST_CS; - ec.name = zend_string_init("STDERR", sizeof("STDERR")-1, 1); + ec.name = zend_string_init_interned("STDERR", sizeof("STDERR")-1, 0); ec.module_number = 0; zend_register_constant(&ec); } |