svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c
trunk/ext/sqlite/pdo_sqlite2.c
| From: | Felipe Pena | Date: | Sat, 12 Jun 2010 22:04:48 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c trunk/ext/sqlite/pdo_sqlite2.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62875@lists.php.net to get a copy of this message | ||
felipe Sat, 12 Jun 2010 22:04:48 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300413
Log:
- Fixed bug #49320 (PDO returns null when SQLite connection fails)
Bug: http://bugs.php.net/49320 (No Feedback) PDO returns
null when SQLite connection fails
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c
U php/php-src/trunk/ext/sqlite/pdo_sqlite2.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2010-06-12 16:33:02 UTC (rev 300412)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-06-12 22:04:48 UTC (rev 300413)
@@ -82,6 +82,7 @@
include file and line in trace). (Felipe)
- Fixed bug #49723 (LimitIterator with empty SeekableIterator). (Etienne)
- Fixed bug #49576 (FILTER_VALIDATE_EMAIL filter needs updating) (Rasmus)
+- Fixed bug #49320 (PDO returns null when SQLite connection fails). (Felipe)
- Fixed bug #49267 (Linking fails for iconv). (Moriyosh)
- Fixed bug #48601 (xpath() returns FALSE for legitimate query). (Rob)
- Fixed bug #48289 (iconv_mime_encode() quoted-printable scheme is broken).
Modified: php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c 2010-06-12 16:33:02 UTC (rev 300412)
+++ php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c 2010-06-12 22:04:48 UTC (rev 300413)
@@ -594,6 +594,7 @@
efree(filename);
if (!H->db) {
+ H->einfo.errcode = SQLITE_ERROR;
pdo_sqlite2_error(errmsg, dbh);
goto cleanup;
}
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-06-12 16:33:02 UTC (rev 300412)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-06-12 22:04:48 UTC (rev 300413)
@@ -201,6 +201,7 @@
- Fixed bug #49576 (FILTER_VALIDATE_EMAIL filter needs updating) (Rasmus)
- Fixed bug #49490 (XPath namespace prefix conflict). (Rob)
- Fixed bug #49429 (odbc_autocommit doesn't work). (Felipe)
+- Fixed bug #49320 (PDO returns null when SQLite connection fails). (Felipe)
- Fixed bug #49234 (mysqli_ssl_set not found). (Andrey)
- Fixed bug #49192 (PHP crashes when GC invoked on COM object). (Stas)
- Fixed bug #49081 (DateTime::diff() mistake if start in January and interval >
Modified: php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c 2010-06-12 16:33:02 UTC (rev 300412)
+++ php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c 2010-06-12 22:04:48 UTC (rev 300413)
@@ -594,6 +594,7 @@
efree(filename);
if (!H->db) {
+ H->einfo.errcode = SQLITE_ERROR;
pdo_sqlite2_error(errmsg, dbh);
goto cleanup;
}
Modified: php/php-src/trunk/ext/sqlite/pdo_sqlite2.c
===================================================================
--- php/php-src/trunk/ext/sqlite/pdo_sqlite2.c 2010-06-12 16:33:02 UTC (rev 300412)
+++ php/php-src/trunk/ext/sqlite/pdo_sqlite2.c 2010-06-12 22:04:48 UTC (rev 300413)
@@ -589,6 +589,7 @@
efree(filename);
if (!H->db) {
+ H->einfo.errcode = SQLITE_ERROR;
pdo_sqlite2_error(errmsg, dbh);
goto cleanup;
}