mike Tue Aug 22 08:16:38 2006 UTC
Modified files:
/php-src/main output.c
/php-src/tests/output ob_014.phpt ob_015.phpt
Log:
- fix tests to comply with upgraded string.c
- use add_next_index_zval() when listing handlers
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.188&r2=1.189&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.188 php-src/main/output.c:1.189
--- php-src/main/output.c:1.188 Tue Aug 22 07:53:58 2006
+++ php-src/main/output.c Tue Aug 22 08:16:37 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.188 2006/08/22 07:53:58 mike Exp $ */
+/* $Id: output.c,v 1.189 2006/08/22 08:16:37 mike Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -1131,11 +1131,8 @@
php_output_handler *handler = *(php_output_handler **) h;
zval *array = (zval *) z;
- if (Z_TYPE_P(handler->name) == IS_UNICODE) {
- add_next_index_unicodel(array, Z_USTRVAL_P(handler->name),
Z_USTRLEN_P(handler->name), 1);
- } else {
- add_next_index_stringl(array, Z_STRVAL_P(handler->name),
Z_STRLEN_P(handler->name), 1);
- }
+ ZVAL_ADDREF(handler->name);
+ add_next_index_zval(array, handler->name);
return 0;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_014.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/output/ob_014.phpt
diff -u php-src/tests/output/ob_014.phpt:1.1
php-src/tests/output/ob_014.phpt:1.2
--- php-src/tests/output/ob_014.phpt:1.1 Fri Jun 2 19:51:43 2006
+++ php-src/tests/output/ob_014.phpt Tue Aug 22 08:16:37 2006
@@ -11,4 +11,4 @@
--EXPECTF--
foo
-Warning: Wrong parameter count for (null)() in %s on line %d
+Warning: (null)() expects exactly 1 parameter, 2 given in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_015.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/output/ob_015.phpt
diff -u php-src/tests/output/ob_015.phpt:1.1
php-src/tests/output/ob_015.phpt:1.2
--- php-src/tests/output/ob_015.phpt:1.1 Fri Jun 2 19:51:43 2006
+++ php-src/tests/output/ob_015.phpt Tue Aug 22 08:16:37 2006
@@ -8,4 +8,4 @@
--EXPECTF--
foo
-Warning: Wrong parameter count for str_rot13() in %s on line %d
+Warning: str_rot13() expects exactly 1 parameter, 2 given in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
