summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2008-03-04 22:25:35 +0000
committerFelipe Pena <felipe@php.net>2008-03-04 22:25:35 +0000
commitb47aea109483b55f1221a0e2f3b95c33d5e76c81 (patch)
tree250cc14728d56127d4bbe6cd6c3344b999b51e03
parentc36af9e2b5e2d9a41f35902d1a71cd2626943904 (diff)
downloadphp-git-b47aea109483b55f1221a0e2f3b95c33d5e76c81.tar.gz
Fixed bug #44333 (SEGFAULT when using mysql_pconnect() with client_flags)
-rw-r--r--NEWS2
-rw-r--r--ext/mysql/php_mysql.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a2590d7718..450c9f5a00 100644
--- a/NEWS
+++ b/NEWS
@@ -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);