mirror of
https://github.com/php/php-src.git
synced 2026-04-22 07:28:09 +02:00
Fixed bug #38319 (Remove bogus warnings from persistent PDO connections).
This commit is contained in:
@@ -131,6 +131,8 @@ PHP NEWS
|
||||
(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").
|
||||
|
||||
+4
-5
@@ -1867,12 +1867,11 @@ fail_out:
|
||||
|
||||
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 @@ fail_out:
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user