iliaa Thu Nov 17 09:38:36 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/sqlite/tests bug35248.phpt
Modified files:
/php-src/ext/sqlite sqlite.c
/php-src NEWS
Log:
Fixed bug #35248 (sqlite_query() doesnt set error_msg when return value is
being used).
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.166.2.5&r2=1.166.2.6&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.5
php-src/ext/sqlite/sqlite.c:1.166.2.6
--- php-src/ext/sqlite/sqlite.c:1.166.2.5 Mon Nov 14 17:02:58 2005
+++ php-src/ext/sqlite/sqlite.c Thu Nov 17 09:38:32 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.5 2005/11/14 22:02:58 tony2001 Exp $
+ $Id: sqlite.c,v 1.166.2.6 2005/11/17 14:38:32 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1125,7 +1125,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.5 2005/11/14 22:02:58
tony2001 Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.6 2005/11/17 14:38:32 iliaa
Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1516,7 +1516,7 @@
/* }}} */
/* {{{ sqlite_query */
-void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long
sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result
**prres TSRMLS_DC)
+void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long
sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result
**prres, zval *errmsg TSRMLS_DC)
{
struct php_sqlite_result res, *rres;
int ret;
@@ -1532,6 +1532,9 @@
if (ret != SQLITE_OK) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+ if (errmsg) {
+ ZVAL_STRING(errmsg, errtext, 1);
+ }
sqlite_freemem(errtext);
goto terminate;
} else if (!res.vm) { /* empty query */
@@ -1632,7 +1635,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value, NULL
TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value,
NULL, errmsg TSRMLS_CC);
}
/* }}} */
@@ -1757,7 +1760,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value, NULL
TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value,
NULL, errmsg TSRMLS_CC);
}
/* }}} */
@@ -2168,7 +2171,7 @@
}
rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
- sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres
TSRMLS_CC);
+ sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres, NULL
TSRMLS_CC);
if (db->last_err_code != SQLITE_OK) {
if (rres) {
efree(rres);
@@ -2284,7 +2287,7 @@
}
rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
- sqlite_query(NULL, db, sql, sql_len, PHPSQLITE_NUM, 0, NULL, &rres
TSRMLS_CC);
+ sqlite_query(NULL, db, sql, sql_len, PHPSQLITE_NUM, 0, NULL, &rres,
NULL TSRMLS_CC);
if (db->last_err_code != SQLITE_OK) {
if (rres) {
efree(rres);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.197&r2=1.2027.2.198&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.197 php-src/NEWS:1.2027.2.198
--- php-src/NEWS:1.2027.2.197 Thu Nov 17 09:19:39 2005
+++ php-src/NEWS Thu Nov 17 09:38:35 2005
@@ -1,6 +1,18 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+17 Nov 2005, PHP 5.1 Release Candidate 6
+- Make zend_parse_params handle integers in a non-strict fashion, but emit an
+ E_NOTICE on non well formed interger values. (Ilia)
+- Fixed bug #35249 (compile failure when ext/readline is compiled as shared).
+ (Jani)
+- Fixed bug #35248 (sqlite_query() doesnt set error_msg when return value is
+ being used). (Ilia)
+- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables
+ blocking). (askalski at gmail dot com, Tony)
+
16 Nov 2005, PHP 5.1 Release Candidate 5
+- Added an E_STRICT warning on the usage of {} for accessing of string offsets.
+ (Ilia)
- Changed type hints to allow "null" as default value for class and array.
(Marcus, Derick, Dmitry)
- Fixed __get/__set to allow recursive calls for different properties. (Dmitry)
@@ -19,8 +31,6 @@
- Fixed bug #35142 (SOAP Client/Server Complex Object Support). (Dmitry)
- Fixed bug #35135 (PDOStatment without related PDO object may crash). (Ilia)
- Fixed bug #35091 (SoapClient leaks memory). (Dmitry)
-- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables
- blocking). (askalski at gmail dot com, Tony)
- Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani)
- Fixed bugs #35022, #35019 (Regression in the behavior of key() and current()
functions). (Ilia)
http://cvs.php.net/co.php/php-src/ext/sqlite/tests/bug35248.phpt?r=1.1&p=1
Index: php-src/ext/sqlite/tests/bug35248.phpt
+++ php-src/ext/sqlite/tests/bug35248.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
