diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-13 13:18:14 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-13 13:28:24 +0800 |
| commit | da7d94cd73a1f654bf49b16b5d1bf221255710de (patch) | |
| tree | 7b7741213cb2f7ed9d8b687596ab41aa73b32c9a /sapi/cli/php_cli.c | |
| parent | 5e7fd50376a3f44bd01ef1041fa0a251317c358c (diff) | |
| parent | adc42657922be5da0e7fe5ac53027c6c4960ae3e (diff) | |
| download | php-git-da7d94cd73a1f654bf49b16b5d1bf221255710de.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
ext/soap/soap.c
ext/standard/basic_functions.c
ext/zlib/zlib.c
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index ca0ea57fa7..8a8e113db0 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -661,7 +661,6 @@ static int do_cli(int argc, char **argv) /* {{{ */ int lineno = 0; const char *param_error=NULL; int hide_argv = 0; - zend_string *key; zend_try { @@ -965,9 +964,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ } } - key = zend_string_init("_SERVER", sizeof("_SERVER")-1, 0); - zend_is_auto_global(key); - zend_string_release(key); + zend_is_auto_global_str(ZEND_STRL("_SERVER")); PG(during_request_startup) = 0; switch (behavior) { |