archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reenable array(object,method) in ob_start()

Browse source
This commit is contained in:
Marcus Boerger 2002-08-25 11:50:25 +00:00
parent e286b286ae
commit 08ab630dc7
1 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

44
main/output.c
View file

@ -480,6 +480,34 @@ static zval* php_ob_handler_from_string(const char *handler_name TSRMLS_DC)
} }
/* }}} */ /* }}} */
/* {{{ php_check_object_method_array
* This function set *name to the 'object->method()' of NULL if given.
* The callee must free that result using efree() function.
*/
static int php_check_object_method_array(HashTable *ht, char **name)
{
if (zend_hash_num_elements(ht)>1) {
zval **object, **method;
if (zend_hash_index_find(ht, 0, (void **) &object)!=FAILURE
&& zend_hash_index_find(ht, 1, (void **) &method)!=FAILURE)
{
if ((*object)->type == IS_OBJECT
&& (*method)->type == IS_STRING)
{
if (*name) {
spprintf(name, 0, "%s->%s()", Z_OBJCE_PP(object)->name, Z_STRVAL_PP(method));
}
return 1;
}
}
}
if (*name)
*name = NULL;
return 0;
}
/* }}} */
/* {{{ php_ob_init /* {{{ php_ob_init
*/ */
static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC) static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC)
@ -517,10 +545,18 @@ static int php_ob_init(uint initial_size, uint block_size, zval *output_handler,
} }
else if (output_handler && output_handler->type == IS_ARRAY) { else if (output_handler && output_handler->type == IS_ARRAY) {
result = 0; result = 0;
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(output_handler), &pos); /* do we have array(object,method) */
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(output_handler), (void **)&tmp, &pos) == SUCCESS) { if (php_check_object_method_array(Z_ARRVAL_P(output_handler), &handler_name)) {
result &= php_ob_init(initial_size, block_size, *tmp, chunk_size, erase TSRMLS_CC); SEPARATE_ZVAL(&output_handler);
zend_hash_move_forward_ex(Z_ARRVAL_P(output_handler), &pos); output_handler->refcount++;
result = php_ob_init_named(initial_size, block_size, handler_name, output_handler, chunk_size, erase TSRMLS_CC);
efree(handler_name);
} else {
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(output_handler), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(output_handler), (void **)&tmp, &pos) == SUCCESS) {
result &= php_ob_init(initial_size, block_size, *tmp, chunk_size, erase TSRMLS_CC);
zend_hash_move_forward_ex(Z_ARRVAL_P(output_handler), &pos);
}
} }
result = result ? SUCCESS : FAILURE; result = result ? SUCCESS : FAILURE;
} }