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

2
ext/mysqlnd/mysqlnd_reverse_api.c
View file

@ -61,7 +61,7 @@ PHPAPI void
mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext TSRMLS_DC)
{
zend_hash_add(&mysqlnd_api_ext_ht, apiext->module->name, strlen(apiext->module->name) + 1, &apiext,
sizeof(MYSQLND_REVERSE_API), NULL);
sizeof(MYSQLND_REVERSE_API *), NULL);
}
/* }}} */