com php-src: Fixed phar file action failure after engine exception rfc been merged: ext/phar/phar_object.c
| From: | Reeze Xia | Date: | Mon, 09 Mar 2015 17:07:18 +0000 |
| Subject: | com php-src: Fixed phar file action failure after engine exception rfc been merged: ext/phar/phar_object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85408@lists.php.net to get a copy of this message | ||
Commit: f174859acdb9d99176440a30b6608388a383de3f
Author: Reeze Xia <reeze@php.net> Mon, 9 Mar 2015 17:07:18 +0000
Parents: 47f2e42fc916ec68d879cb615ac6f14d6431c12a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f174859acdb9d99176440a30b6608388a383de3f
Log:
Fixed phar file action failure after engine exception rfc been merged
Changed paths:
M ext/phar/phar_object.c
Diff:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object..c
index 69bda4b..b05ba59 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -298,6 +298,10 @@ static int phar_file_action(phar_archive_data *phar, phar_entry_info *info,
char
efree(name);
} zend_end_try();
+ if (EG(exception)) {
+ zend_exception_error(EG(exception), E_ERROR);
+ }
+
zend_bailout();
}