mirror of
https://github.com/php/php-src.git
synced 2024-12-03 06:44:07 +08:00
revert
This commit is contained in:
parent
ba5798cb4d
commit
a06d3b7bf3
2
NEWS
2
NEWS
@ -12,8 +12,6 @@ PHP NEWS
|
||||
- Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of
|
||||
"extends"). (Marcus)
|
||||
- Fixed bug #41093 (magic_quotes_gpc ignores first arrays keys). (Arpad, Ilia)
|
||||
- Fixed bug #41083 (mysql_ping() requires MYSQL_OPT_RECONNECT to be set since
|
||||
MySQL 5.0.13). (xiaojb at gmail dot com, Tony)
|
||||
- Fixed bug #41075 (memleak when creating default object caused exception).
|
||||
(Dmitry)
|
||||
- Fixed bug #41067 (json_encode() problem with UTF-16 input). (jp at df5ea
|
||||
|
@ -39,9 +39,6 @@ PHP_FUNCTION(mysqli_connect)
|
||||
char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
|
||||
unsigned int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
|
||||
long port=0;
|
||||
#if MYSQL_VERSION_ID > 50012
|
||||
my_bool my_true = 1;
|
||||
#endif
|
||||
|
||||
if (getThis() && !ZEND_NUM_ARGS()) {
|
||||
RETURN_NULL();
|
||||
@ -87,10 +84,6 @@ PHP_FUNCTION(mysqli_connect)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if MYSQL_VERSION_ID > 50012
|
||||
mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (const char *)&my_true);
|
||||
#endif
|
||||
|
||||
if (!socket) {
|
||||
socket = MyG(default_socket);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user