com php-src: Revert "Fixed phar file action failure after engine exception rfc been merged": ext/phar/phar_object.c
| From: | Xinchen Hui | Date: | Tue, 10 Mar 2015 07:03:15 +0000 |
| Subject: | com php-src: Revert "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-85425@lists.php.net to get a copy of this message | ||
Commit: d25acb5fd08a774feb5831c4cad308cb19357924
Author: Xinchen Hui <laruence@php.net> Tue, 10 Mar 2015 15:03:15 +0800
Parents: dd16a7c82045383c8556a67c649a6b503099d040
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d25acb5fd08a774feb5831c4cad308cb19357924
Log:
Revert "Fixed phar file action failure after engine exception rfc been merged"
This reverts commit f174859acdb9d99176440a30b6608388a383de3f.
Changed paths:
M ext/phar/phar_object.c
Diff:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index b05ba59..69bda4b 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -298,10 +298,6 @@ 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();
}