tony2001 Sat Nov 19 11:41:09 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/pdo pdo_dbh.c
Log:
MFH: fix #35293 (PDO segfaults when using persistent connections)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.207&r2=1.2027.2.208&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.207 php-src/NEWS:1.2027.2.208
--- php-src/NEWS:1.2027.2.207 Fri Nov 18 16:23:19 2005
+++ php-src/NEWS Sat Nov 19 11:41:07 2005
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Nov 2005, PHP 5.1
+- FIxed bug #35293 (PDO segfaults when using persistent connections). (Tony)
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.13&r2=1.82.2.14&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.13 php-src/ext/pdo/pdo_dbh.c:1.82.2.14
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.13 Wed Oct 26 23:51:23 2005
+++ php-src/ext/pdo/pdo_dbh.c Sat Nov 19 11:41:08 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.13 2005/10/27 03:51:23 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.14 2005/11/19 16:41:08 tony2001 Exp $ */
/* The PDO Database Handle Class */
@@ -341,6 +341,8 @@
if (pdbh) {
/* let's copy the emalloc bits over from the other
handle */
pdbh->ce = dbh->ce;
+ pdbh->def_stmt_ce = dbh->def_stmt_ce;
+ pdbh->def_stmt_ctor_args = dbh->def_stmt_ctor_args;
pdbh->properties = dbh->properties;
/* kill the non-persistent thingamy */
efree(dbh);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
