iliaa Mon Dec 4 03:07:44 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pdo pdo_stmt.c
Log:
Fixed bug #38319 (Remove bogus warnings from persistent PDO connections).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.396&r2=1.2027.2.547.2.397&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.396 php-src/NEWS:1.2027.2.547.2.397
--- php-src/NEWS:1.2027.2.547.2.396 Mon Dec 4 02:40:08 2006
+++ php-src/NEWS Mon Dec 4 03:07:44 2006
@@ -131,6 +131,8 @@
(Dmitry)
- Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
ErrorDocument). (Ilia)
+- Fixed bug #38319 (Remove bogus warnings from persistent PDO connections).
+ (Ilia)
- Fixed bug #38252 (Incorrect PDO error message on invalid default fetch
mode). (Ilia)
- Fixed bug #37773 (iconv_substr() gives "Unknown error" when string length =
1").
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.10&r2=1.118.2.38.2.11&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.10
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.11
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.10 Tue Nov 28 16:27:52 2006
+++ php-src/ext/pdo/pdo_stmt.c Mon Dec 4 03:07:44 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.10 2006/11/28 16:27:52 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.11 2006/12/04 03:07:44 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -1867,12 +1867,11 @@
stmt->fetch.cls.ce = *cep;
stmt->fetch.cls.ctor_args = NULL;
-
+#ifdef ilia_0 /* we'll only need this when we have persistent statements, if
ever */
if (stmt->dbh->is_persistent) {
- /* TODO: CRITICAL for final release */
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"PHP might crash if you don't call $stmt->setFetchMode() to reset to defaults
on this persistent statement. This will be fixed in a later release");
}
-
+#endif
if (argc == 3) {
if (Z_TYPE_PP(args[skip+2]) != IS_NULL &&
Z_TYPE_PP(args[skip+2]) != IS_ARRAY) {
pdo_raise_impl_error(stmt->dbh, stmt,
"HY000", "ctor_args must be either NULL or an array" TSRMLS_CC);
@@ -1893,11 +1892,11 @@
if (Z_TYPE_PP(args[skip+1]) != IS_OBJECT) {
goto fail_out;
}
-
+#ifdef ilia_0 /* we'll only need this when we have persistent statements, if
ever */
if (stmt->dbh->is_persistent) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"PHP might crash if you don't call $stmt->setFetchMode() to reset to defaults
on this persistent statement. This will be fixed in a later release");
}
-
+#endif
MAKE_STD_ZVAL(stmt->fetch.into);
Z_TYPE_P(stmt->fetch.into) = IS_OBJECT;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
