diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:13:43 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:13:43 -0700 |
| commit | f2f8ea9ac53973a1ddb55ddc5eae3109d841309c (patch) | |
| tree | 8fd13ecb77212cabcd78cfd17dc3fe89a1592661 | |
| parent | d52c4857178cf30741905469c5a080bbdd973478 (diff) | |
| parent | f1acac154ac7684bc908fc2ad8962372c9d4e312 (diff) | |
| download | php-git-f2f8ea9ac53973a1ddb55ddc5eae3109d841309c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
__wakeup doesn't have to be final
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 806c2ef9e3..40248f7f5e 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -755,7 +755,7 @@ ZEND_END_ARG_INFO() const static zend_function_entry default_exception_functions[] = { ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC) - ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC) ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(exception, getCode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(exception, getFile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) |