From: Stanislav Malyshev <stas@php.net>
Date: Tue, 4 Aug 2015 23:14:32 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta3~1^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54daa5317f8af16ca7a14ae7a66c00ddd87a6e70;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  __wakeup doesn't have to be final
---

54daa5317f8af16ca7a14ae7a66c00ddd87a6e70
diff --cc Zend/zend_exceptions.c
index 51ea2319bf,40248f7f5e..f03bc40e47
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@@ -805,10 -752,10 +805,10 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exceptio
  	ZEND_ARG_INFO(0, previous)
  ZEND_END_ARG_INFO()
  
 -const static zend_function_entry default_exception_functions[] = {
 +static const 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)