dmitry Wed May 2 17:24:16 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /ZendEngine2 zend_compile.c /php-src/ext/soap php_encoding.c Log: Reverted the following fixed because of php-5.2.2 release process - Fixed altering $this via argument named "this". - Fixed bug #41097 (ext/soap returning associative array as indexed without using WSDL). - Fixed bug #41004 (minOccurs="0" and null class member variable). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.672&r2=1.2027.2.547.2.673&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.672 php-src/NEWS:1.2027.2.547.2.673 --- php-src/NEWS:1.2027.2.547.2.672 Wed May 2 13:21:54 2007 +++ php-src/NEWS Wed May 2 17:24:15 2007 @@ -1,13 +1,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Apr 2007, PHP 5.2.3RC3 -- Fixed altering $this via argument named "this". (Dmitry) - Fixed iterator_apply() with a callback using __call(). (Johannes) - Fixed bug #41215 (setAttribute return code reversed). (Ilia) - Fixed bug #41192 (Per Directory Values only work for one key). (Dmitry) -- Fixed bug #41097 (ext/soap returning associative array as indexed without - using WSDL). (Dmitry) -- Fixed bug #41004 (minOccurs="0" and null class member variable). (Dmitry) 26 Apr 2007, PHP 5.2.2RC2 - Added GMP_VERSION constant. (Tony) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.36&r2=1.647.2.27.2.37&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.36 ZendEngine2/zend_compile.c:1.647.2.27.2.37 --- ZendEngine2/zend_compile.c:1.647.2.27.2.36 Wed May 2 13:21:54 2007 +++ ZendEngine2/zend_compile.c Wed May 2 17:24:15 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.36 2007/05/02 13:21:54 dmitry Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.37 2007/05/02 17:24:15 dmitry Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -1265,18 +1265,9 @@ void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, znode *class_type, znode *varname, zend_uchar pass_by_reference TSRMLS_DC) { - zend_op *opline; + zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); zend_arg_info *cur_arg_info; - if (CG(active_op_array)->scope && - ((CG(active_op_array)->fn_flags & ZEND_ACC_STATIC) == 0) && - (Z_TYPE(varname->u.constant) == IS_STRING) && - (Z_STRLEN(varname->u.constant) == sizeof("this")-1) && - (memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")) == 0)) { - zend_error(E_COMPILE_ERROR, "Cannot re-assign $this"); - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); CG(active_op_array)->num_args++; opline->opcode = op; opline->result = *var; http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.31&r2=1.103.2.21.2.32&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.31 php-src/ext/soap/php_encoding.c:1.103.2.21.2.32 --- php-src/ext/soap/php_encoding.c:1.103.2.21.2.31 Wed May 2 09:38:12 2007 +++ php-src/ext/soap/php_encoding.c Wed May 2 17:24:16 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.21.2.31 2007/05/02 09:38:12 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21.2.32 2007/05/02 17:24:16 dmitry Exp $ */ #include <time.h> @@ -1595,8 +1595,6 @@ property = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlAddChild(node, property); set_xsi_nil(property); - } else if (Z_TYPE_P(data) == IS_NULL && model->min_occurs == 0) { - return 1; } else { property = master_to_xml(enc, data, style, node); if (property->children && property->children->content && @@ -3358,12 +3356,8 @@ int i, count = zend_hash_num_elements(Z_ARRVAL_P(array)); zend_hash_internal_pointer_reset(Z_ARRVAL_P(array)); - for (i = 0; i < count; i++) { - char *str_index; - ulong num_index; - - if (zend_hash_get_current_key(Z_ARRVAL_P(array), &str_index, &num_index, 0) == HASH_KEY_IS_STRING || - num_index != i) { + for (i = 0;i < count;i++) { + if (zend_hash_get_current_key_type(Z_ARRVAL_P(array)) == HASH_KEY_IS_STRING) { return TRUE; } zend_hash_move_forward(Z_ARRVAL_P(array));
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php