[BACK]Return to zend_interfaces.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend_interfaces.c between versions 1.1.1.2 and 1.1.1.4

version 1.1.1.2, 2012/05/29 12:34:35 version 1.1.1.4, 2014/06/15 20:04:03
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | Zend Engine                                                          |     | Zend Engine                                                          |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |     | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |      | that is bundled with this package in the file LICENSE, and is        | 
Line 127  ZEND_API zval *zend_user_it_new_iterator(zend_class_en Line 127  ZEND_API zval *zend_user_it_new_iterator(zend_class_en
 }  }
 /* }}} */  /* }}} */
   
/* {{{ zend_user_it_dtor *//* {{{ zend_user_it_invalidate_current */
 ZEND_API void zend_user_it_invalidate_current(zend_object_iterator *_iter TSRMLS_DC)  ZEND_API void zend_user_it_invalidate_current(zend_object_iterator *_iter TSRMLS_DC)
 {  {
         zend_user_iterator *iter = (zend_user_iterator*)_iter;          zend_user_iterator *iter = (zend_user_iterator*)_iter;
Line 452  ZEND_API int zend_user_serialize(zval *object, unsigne Line 452  ZEND_API int zend_user_serialize(zval *object, unsigne
                 zval_ptr_dtor(&retval);                  zval_ptr_dtor(&retval);
         }          }
   
        if (result == FAILURE) {        if (result == FAILURE && !EG(exception)) {
                 zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "%s::serialize() must return a string or NULL", ce->name);                  zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "%s::serialize() must return a string or NULL", ce->name);
         }          }
         return result;          return result;
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>