This forces a better error message for non working clone calls.

diff --git a/Zend/zend_default_classes.c b/Zend/zend_default_classes.c
index a47209db730d1988d43371511ff2c23bc58e2319..2bbae70c0c1358eac8cf9f70cc43642e170bfa03 100644 (file)
--- a/Zend/zend_default_classes.c
+++ b/Zend/zend_default_classes.c
@@ -390,6 +390,7 @@ static void zend_register_default_exception(TSRMLS_D)
        default_exception_ptr = zend_register_internal_class(&ce TSRMLS_CC);
        default_exception_ptr->create_object = zend_default_exception_new; 
        memcpy(&default_exception_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       default_exception_handlers.clone_obj = NULL;
        default_exception_handlers.cast_object = zend_cast_exception;
 
        zend_declare_property_string(default_exception_ptr, "message", sizeof("message")-1, "Unknown exception", ZEND_ACC_PROTECTED TSRMLS_CC);

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index a47209db730d1988d43371511ff2c23bc58e2319..2bbae70c0c1358eac8cf9f70cc43642e170bfa03 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -390,6 +390,7 @@ static void zend_register_default_exception(TSRMLS_D)
        default_exception_ptr = zend_register_internal_class(&ce TSRMLS_CC);
        default_exception_ptr->create_object = zend_default_exception_new; 
        memcpy(&default_exception_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       default_exception_handlers.clone_obj = NULL;
        default_exception_handlers.cast_object = zend_cast_exception;
 
        zend_declare_property_string(default_exception_ptr, "message", sizeof("message")-1, "Unknown exception", ZEND_ACC_PROTECTED TSRMLS_CC);

diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index 9dec257d58dd248403d4410309b42ee903c6b084..99aaecd3e2f7014a94e29bcfb3fbe95bd2e9dade 100644 (file)
--- a/Zend/zend_reflection_api.c
+++ b/Zend/zend_reflection_api.c
@@ -3039,6 +3039,7 @@ ZEND_API void zend_register_reflection_api(TSRMLS_D) {
        zend_class_entry _reflection_entry;
 
        memcpy(&reflection_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       reflection_object_handlers.clone_obj = NULL;
 
        INIT_CLASS_ENTRY(_reflection_entry, "reflection_exception", reflection_exception_functions);
        reflection_exception_ptr = zend_register_internal_class_ex(&_reflection_entry, zend_exception_get_default(), NULL TSRMLS_CC);

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 9dec257d58dd248403d4410309b42ee903c6b084..99aaecd3e2f7014a94e29bcfb3fbe95bd2e9dade 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -3039,6 +3039,7 @@ ZEND_API void zend_register_reflection_api(TSRMLS_D) {
        zend_class_entry _reflection_entry;
 
        memcpy(&reflection_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       reflection_object_handlers.clone_obj = NULL;
 
        INIT_CLASS_ENTRY(_reflection_entry, "reflection_exception", reflection_exception_functions);
        reflection_exception_ptr = zend_register_internal_class_ex(&_reflection_entry, zend_exception_get_default(), NULL TSRMLS_CC);