diff options
author | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
commit | 89d89b95861c4366f93e705546c0ca8c4443a425 (patch) | |
tree | d59aaef97b53a61bc7c10de368dad7adcc34fef7 /ext/standard/basic_functions.c | |
parent | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (diff) | |
parent | fa588a5c82c0264dc10862495c993a914a421667 (diff) | |
download | php-git-89d89b95861c4366f93e705546c0ca8c4443a425.tar.gz |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r-- | ext/standard/basic_functions.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index bf9a5a94db..7647781e2b 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3760,9 +3760,7 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */ BG(page_inode) = -1; BG(page_mtime) = -1; #ifdef HAVE_PUTENV - if (zend_hash_init(&BG(putenv_ht), 1, NULL, php_putenv_destructor, 0) == FAILURE) { - return FAILURE; - } + zend_hash_init(&BG(putenv_ht), 1, NULL, php_putenv_destructor, 0); #endif BG(user_shutdown_function_names) = NULL; |