-
-
Notifications
You must be signed in to change notification settings - Fork 466
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed "require" regression introduced in the 0.10.12
- Loading branch information
1 parent
664381e
commit 50907cb
Showing
3 changed files
with
23 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,13 @@ | ||
|
||
/* | ||
+------------------------------------------------------------------------+ | ||
| Zephir Language | | ||
+------------------------------------------------------------------------+ | ||
| Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com) | | ||
+------------------------------------------------------------------------+ | ||
| This source file is subject to the New BSD License that is bundled | | ||
| with this package in the file docs/LICENSE.txt. | | ||
| | | ||
| If you did not receive a copy of the license and are unable to | | ||
| obtain it through the world-wide-web, please send an email | | ||
| to [email protected] so we can send you a copy immediately. | | ||
+------------------------------------------------------------------------+ | ||
| Authors: Andres Gutierrez <[email protected]> | | ||
| Eduar Carvajal <[email protected]> | | ||
| Vladimir Kolesnikov <[email protected]> | | ||
+------------------------------------------------------------------------+ | ||
*/ | ||
* This file is part of the Zephir. | ||
* | ||
* (c) Zephir Team <[email protected]> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. If you did not receive | ||
* a copy of the license it is available through the world-wide-web at the | ||
* following url: https://docs.zephir-lang.com/en/latest/license | ||
*/ | ||
|
||
#ifdef HAVE_CONFIG_H | ||
#include "config.h" | ||
|
@@ -42,17 +33,8 @@ int zephir_require_ret(zval *return_value_ptr, const char *require_path) | |
zend_file_handle file_handle; | ||
zend_op_array *new_op_array; | ||
zval dummy, local_retval; | ||
char realpath[MAXPATHLEN]; | ||
int ret; | ||
|
||
if (UNEXPECTED(!VCWD_REALPATH(require_path, realpath))) { | ||
#ifndef ZEPHIR_RELEASE | ||
fprintf(stderr, "%s: Failed opening file %s", __func__, require_path); | ||
zephir_print_backtrace(); | ||
#endif | ||
return FAILURE; | ||
} | ||
|
||
ZVAL_UNDEF(&local_retval); | ||
|
||
#ifndef ZEPHIR_RELEASE | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.