mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-04 15:23:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Antony Dovgal 2007-04-23 09:27:07 +00:00
parent ba5798cb4d
commit a06d3b7bf3
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -12,8 +12,6 @@ PHP NEWS
- Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of - Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of
"extends"). (Marcus) "extends"). (Marcus)
- Fixed bug #41093 (magic_quotes_gpc ignores first arrays keys). (Arpad, Ilia) - 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). - Fixed bug #41075 (memleak when creating default object caused exception).
(Dmitry) (Dmitry)
- Fixed bug #41067 (json_encode() problem with UTF-16 input). (jp at df5ea - Fixed bug #41067 (json_encode() problem with UTF-16 input). (jp at df5ea

7
ext/mysqli/mysqli_nonapi.c
View File

@ -39,9 +39,6 @@ PHP_FUNCTION(mysqli_connect)
char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL; 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; unsigned int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
long port=0; long port=0;
#if MYSQL_VERSION_ID > 50012
my_bool my_true = 1;
#endif
if (getThis() && !ZEND_NUM_ARGS()) { if (getThis() && !ZEND_NUM_ARGS()) {
RETURN_NULL(); RETURN_NULL();
@ -87,10 +84,6 @@ PHP_FUNCTION(mysqli_connect)
} }
#endif #endif
#if MYSQL_VERSION_ID > 50012
mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (const char *)&my_true);
#endif
if (!socket) { if (!socket) {
socket = MyG(default_socket); socket = MyG(default_socket);
} }