From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 22 Apr 2007 15:19:08 +0000 (+0000)
Subject: Fixed bug #41159 (mysql_pconnect() hash does not account for connect
X-Git-Tag: php-5.2.2RC2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0369b693b4efe3c273f47e561ada742218e80425;p=php

Fixed bug #41159 (mysql_pconnect() hash does not account for connect
flags).
---

diff --git a/NEWS b/NEWS
index ffb020a58a..095d1cd103 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Apr 2007, PHP 5.2.2RC2
 - Upgraded SQLite 3 to version 3.3.16 (Ilia)
+- Fixed bug #41159 (mysql_pconnect() hash does not account for connect
+  flags). (Ilia)
 - Fixed bug #41121 (range() overflow handling for large numbers on 32bit
   machines). (Ilia)
 - Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index b0e54ad47b..9065135e44 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -618,7 +618,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			}
 		}
 
-		hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd));
+		hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s_%d", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags);
 	}
 
 	/* We cannot use mysql_port anymore in windows, need to use