Index: Zend/zend_compile.c
===================================================================
RCS file: /repository/ZendEngine2/zend_compile.c,v
retrieving revision 1.647.2.27.2.41.2.83
diff -u -p -r1.647.2.27.2.41.2.83 zend_compile.c
--- Zend/zend_compile.c	22 Aug 2008 15:54:20 -0000	1.647.2.27.2.41.2.83
+++ Zend/zend_compile.c	24 Aug 2008 18:20:32 -0000
@@ -2780,6 +2780,14 @@ ZEND_API void zend_do_inheritance(zend_c
 	}
 
 	ce->parent = parent_ce;
+	/* Copy serialize/unserialize callbacks */
+	if (!ce->serialize) {
+		ce->serialize   = parent_ce->serialize;
+	}
+	if (!ce->unserialize) {
+		ce->unserialize = parent_ce->unserialize;
+	}
+
 	/* Inherit interfaces */
 	zend_do_inherit_interfaces(ce, parent_ce TSRMLS_CC);
 
Index: Zend/zend_interfaces.c
===================================================================
RCS file: /repository/ZendEngine2/zend_interfaces.c,v
retrieving revision 1.33.2.4.2.6.2.5
diff -u -p -r1.33.2.4.2.6.2.5 zend_interfaces.c
--- Zend/zend_interfaces.c	24 Jul 2008 09:42:15 -0000	1.33.2.4.2.6.2.5
+++ Zend/zend_interfaces.c	24 Aug 2008 18:20:32 -0000
@@ -405,7 +405,7 @@ static int zend_implement_arrayaccess(ze
 /* }}}*/
 
 /* {{{ zend_user_serialize */
-int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC)
+ZEND_API int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC)
 {
 	zend_class_entry * ce = Z_OBJCE_P(object);
 	zval *retval;
@@ -442,7 +442,7 @@ int zend_user_serialize(zval *object, un
 /* }}} */
 
 /* {{{ zend_user_unserialize */
-int zend_user_unserialize(zval **object, zend_class_entry *ce, const unsigned char *buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC)
+ZEND_API int zend_user_unserialize(zval **object, zend_class_entry *ce, const unsigned char *buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC)
 {
 	zval * zdata;
 
@@ -466,13 +466,17 @@ int zend_user_unserialize(zval **object,
 /* {{{ zend_implement_serializable */
 static int zend_implement_serializable(zend_class_entry *interface, zend_class_entry *class_type TSRMLS_DC)
 {
-	if ((class_type->serialize   && class_type->serialize   != zend_user_serialize)
-	||  (class_type->unserialize && class_type->unserialize != zend_user_unserialize)
-	) {
+	if (class_type->parent
+		&& (class_type->parent->serialize || class_type->parent->unserialize)
+		&& !instanceof_function_ex(class_type->parent, zend_ce_serializable, 1 TSRMLS_CC)) {
 		return FAILURE;
 	}
-	class_type->serialize = zend_user_serialize;
-	class_type->unserialize = zend_user_unserialize;
+	if (!class_type->serialize) {
+		class_type->serialize = zend_user_serialize;
+	}
+	if (!class_type->unserialize) {
+		class_type->unserialize = zend_user_unserialize;
+	}
 	return SUCCESS;
 }
 /* }}}*/
Index: Zend/zend_interfaces.h
===================================================================
RCS file: /repository/ZendEngine2/zend_interfaces.h,v
retrieving revision 1.11.2.1.2.2.2.1
diff -u -p -r1.11.2.1.2.2.2.1 zend_interfaces.h
--- Zend/zend_interfaces.h	31 Dec 2007 07:17:04 -0000	1.11.2.1.2.2.2.1
+++ Zend/zend_interfaces.h	24 Aug 2008 18:20:32 -0000
@@ -61,6 +61,9 @@ ZEND_API zend_object_iterator *zend_user
 
 ZEND_API void zend_register_interfaces(TSRMLS_D);
 
+ZEND_API int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC);
+ZEND_API int zend_user_unserialize(zval **object, zend_class_entry *ce, const unsigned char *buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC);
+
 END_EXTERN_C()
 
 #endif /* ZEND_INTERFACES_H */