iliaa Tue Mar 21 15:35:29 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_nonapi.c
/php-src NEWS
Log:
Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.5&r2=1.54.2.6&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.5
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.6
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.5 Sun Jan 1 12:50:09 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Mar 21 15:35:28 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54.2.5 2006/01/01 12:50:09 sniper Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.6 2006/03/21 15:35:28 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -326,7 +326,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, "mysqli_link");
- if (mysql_set_character_set(mysql->mysql, cs_name)) {
+ if (!mysql->mysql->thread_id || mysql_set_character_set(mysql->mysql,
cs_name)) {
RETURN_FALSE;
}
RETURN_TRUE;
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.475&r2=1.2027.2.476&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.475 php-src/NEWS:1.2027.2.476
--- php-src/NEWS:1.2027.2.475 Tue Mar 21 12:04:55 2006
+++ php-src/NEWS Tue Mar 21 15:35:28 2006
@@ -12,6 +12,8 @@
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
- Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony)
+- Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
+ (Ilia)
- Fixed bug #36721 (The SoapServer is not able to send a header that it didn't
receive). (Dmitry)
- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
