diff options
author | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
---|---|---|
committer | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
commit | ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7 (patch) | |
tree | 360c977fa1f03c2db397743988cd003e2321e44c /sapi/cli/php_cli_server.c | |
parent | 55abb5d39501ca0fa9bc704198785b1f98c95bb2 (diff) | |
parent | 7302b72d6e6bb77446599ec29a3b89702a506025 (diff) | |
download | php-git-ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7.tar.gz |
Merge branch 'master' into openssl_aead
Diffstat (limited to 'sapi/cli/php_cli_server.c')
-rw-r--r-- | sapi/cli/php_cli_server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 529f5633bf..4ee85bf538 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -2050,6 +2050,8 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server zend_try { zval retval; + + ZVAL_UNDEF(&retval); if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE, &retval, 1, &zfd)) { if (Z_TYPE(retval) != IS_UNDEF) { decline = Z_TYPE(retval) == IS_FALSE; |