diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |