diff options
author | Felipe Pena <felipe@php.net> | 2008-03-04 22:25:35 +0000 |
---|---|---|
committer | Felipe Pena <felipe@php.net> | 2008-03-04 22:25:35 +0000 |
commit | b47aea109483b55f1221a0e2f3b95c33d5e76c81 (patch) | |
tree | 250cc14728d56127d4bbe6cd6c3344b999b51e03 | |
parent | c36af9e2b5e2d9a41f35902d1a71cd2626943904 (diff) | |
download | php-git-b47aea109483b55f1221a0e2f3b95c33d5e76c81.tar.gz |
Fixed bug #44333 (SEGFAULT when using mysql_pconnect() with client_flags)
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | ext/mysql/php_mysql.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Mar 2008, PHP 5.2.6 +- Fixed bug #44333 (SEGFAULT when using mysql_pconnect() with client_flags). + (Felipe) - Fixed bug #44325 (mssql_bind not correctly bind empty strings as parameter value). (Ilia) - Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index f6bd8e4343..68082b2131 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -517,7 +517,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) int user_len, passwd_len, host_len; char *hashed_details=NULL; int hashed_details_length, port = MYSQL_PORT; - int client_flags = 0; + long client_flags = 0; php_mysql_conn *mysql=NULL; #if MYSQL_VERSION_ID <= 32230 void (*handler) (int); |