archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Browse source 
Conflicts:
	ext/mysqli/tests/mysqli_begin_transaction.phpt
This commit is contained in:
Andrey Hristov 2014-04-10 16:49:13 +03:00
commit 090c3e87c0
140 changed files with 4204 additions and 2027 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/mysqlnd/php_mysqlnd.c
View file

@ -107,17 +107,17 @@ static void
mysqlnd_minfo_dump_api_plugins(smart_str * buffer TSRMLS_DC)
{
HashTable *ht = mysqlnd_reverse_api_get_api_list(TSRMLS_C);
Bucket *p;
HashPosition pos;
MYSQLND_REVERSE_API **ext;
p = ht->pListHead;
while(p != NULL) {
MYSQLND_REVERSE_API * ext = *(MYSQLND_REVERSE_API **) p->pData;
for (zend_hash_internal_pointer_reset_ex(ht, &pos);
zend_hash_get_current_data_ex(ht, (void **) &ext, &pos);
zend_hash_move_forward_ex(ht, &pos)
) {
if (buffer->len) {
smart_str_appendc(buffer, ',');
}
smart_str_appends(buffer, ext->module->name);
p = p->pListNext;
smart_str_appends(buffer, (*ext)->module->name);
}
}
/* }}} */