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

flags).

diff --git a/NEWS b/NEWS
index ffb020a58a7360d7d3f11b0f50bc020e65961d5e..095d1cd103b0b279d65c7e6b19f8940393c3e8cc 100644 (file)
--- 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 b0e54ad47bfb154e1939975544759395a387c8bf..9065135e44dc53443433698ea08a6d6cce6b9ac5 100644 (file)
--- 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