summaryrefslogtreecommitdiff
path: root/ext/sqlite3/sqlite3.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'PHP-7.1'Christoph M. Becker2016-12-291-0/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Revert "Fix #73530: Unsetting result set may reset other result set"
| * | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-12-291-0/+3
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Revert "Fix #73530: Unsetting result set may reset other result set"
| | * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-12-291-0/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Revert "Fix #73530: Unsetting result set may reset other result set" # Conflicts: # ext/sqlite3/sqlite3.c
| | | * Revert "Fix #73530: Unsetting result set may reset other result set"Christoph M. Becker2016-12-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit eb570294a289b45d0dd38efc71065d6b0d314c4b. That commit caused a regression, so it's probably best to revert it, and to tackle the issue for the next minor release.
* | | | Merge branch 'PHP-7.1'Christoph M. Becker2016-11-161-3/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-11-161-3/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-11-161-3/+0
| | |\ \ | | | |/
| | | * Fix #73530: Unsetting result set may reset other result setChristoph M. Becker2016-11-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling sqlite3_reset() when a result set object is freed can cause undesired and maybe even hard to track interference with other result sets. Furthermore, there is no need to call sqlite3_reset(), because that is implicitly called on SQLite3Stmt::execute(), and users are encouraged to explicitly call either SQLite3Result::finalize() or SQLite3Stmt::reset() anyway.
* | | | Fix compiler warnings, always cast to zend_long from sqlite3_int64 when ↵Kalle Sommer Nielsen2016-10-201-2/+2
| | | | | | | | | | | | | | | | converting to a zval
* | | | Ignore the return value of sqlite3->busyTimeout() if their "API Armor" is ↵Kalle Sommer Nielsen2016-10-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | not enabled. The sqlite3_busy_timeout() function can only ever return SQLITE_OK if the armor is not compiled in, which means we can skip this error check
* | | | Merge branch 'PHP-7.1'Christoph M. Becker2016-10-181-2/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-10-181-2/+9
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-10-171-2/+9
| | |\ \ | | | |/ | | | | | | | | We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
| | | * Fix #73333: 2147483647 is fetched as stringChristoph M. Becker2016-10-171-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We return all integers that can be represented as such by PHP as integers, and only those that exceed the possible range as strings. On builds which represent integers with 64 bits, the range check is unnecessary and might cause code checkers to complain, so we skip this special casing via the preprocessor according to <http://git.php.net/?p=php-src.git;a=commit;h=99d087e5>.
* | | | Fix typoChristoph M. Becker2016-09-021-4/+4
|/ / /
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-271-8/+7
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-271-8/+7
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/sqlite3/sqlite3.c
| | * Implement #72653: SQLite should allow opening with empty filenameChristoph M. Becker2016-07-271-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the [sqlite3_open](https://www.sqlite.org/c3ref/open.html) docs: | If the filename is an empty string, then a private, temporary on-disk | database will be created. This private database will be automatically | deleted as soon as the database connection is closed. We make that facility available to userland. While we're at it, we also do some minor optimizations, remove the unnecessary check for NUL characters in filename, which is already catered to by ZPP(p), and add a missing `return` in case db_obj isn't initialized.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-251-2/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-251-2/+6
| |\ \ | | |/ | | | | | | | | | | | | # Resolved conflicts: # ext/sqlite3/sqlite3.c # ext/sqlite3/tests/bug72668.phpt
| | * Further fixes wrt. bug #72668Christoph M. Becker2016-07-251-3/+9
| | | | | | | | | | | | | | | Not only SQLite3::querySingle(), but also SQLite3::query() and SQLite3Stmt::execute() were affected.
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-07-251-1/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)
| * | Fixed bug #72668 (Spurious warning when exception is thrown in user defined ↵Xinchen Hui2016-07-251-1/+3
| | | | | | | | | | | | function)
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-07-111-1/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)
| * | Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)Xinchen Hui2016-07-111-1/+3
| | |
* | | Merge branch 'PHP-7.0'Christoph M. Becker2016-06-271-0/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-06-271-0/+6
| |\ \ | | |/
| | * Fix #70628: Clearing bindings on an SQLite3 statement doesn't workChristoph M. Becker2016-06-271-0/+6
| | | | | | | | | | | | | | | Obiously, it isn't sufficient to call sqlite3_clear_bindings() alone, but also the bound_params of the php_sqlite3_stmt have to be cleared.
* | | Fixed compilation warningsDmitry Stogov2016-06-221-1/+2
| | |
* | | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵Dmitry Stogov2016-04-271-2/+0
| | | | | | | | | | | | but is never used.
* | | Merge branch 'PHP-7.0'Anatol Belski2016-04-121-0/+30
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #68849 bindValue is not using the right data type
| * | Fixed bug #68849 bindValue is not using the right data typeAnatol Belski2016-04-121-0/+30
| | |
* | | Merge branch 'PHP-7.0'Nikita Popov2016-03-031-1/+1
|\ \ \ | |/ /
| * | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| | | | | | | | | | | | Also re bug #71575.
* | | Removed zend_fcall_info.symbol_tableDmitry Stogov2016-03-021-2/+0
| | |
* | | Merge branch 'PHP-7.0'Nikita Popov2016-02-131-1/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-02-131-1/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/sqlite3/sqlite3.c
| | * Check length of string before comparing to :memory:Nikita Popov2016-02-131-1/+2
| | |
* | | Remove version checksNikita Popov2016-01-301-19/+0
|/ / | | | | | | | | | | | | | | | | | | | | PHP_VERSION_ID PHP_API_VERSION ZEND_MODULE_API_NO PHP_MAJOR_VERSION, PHP_MINOR_VERSION ZEND_ENGINE_2 I've left litespeed alone, as it seems to genuinely maintain support for many PHP versions.
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
* | Fixed Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead ↵Xinchen Hui2015-12-071-2/+1
| | | | | | | | of internal buffer)
* | fix crash in sqlite when executing with bound stream paramAnatol Belski2015-11-051-4/+5
| | | | | | | | rel #70862
* | Fixed Conditional jump or move depends on uninitialised valueXinchen Hui2015-10-141-0/+2
| |
* | Fix a memory leak in sqlite3_do_callback.Adam Harvey2015-09-241-1/+5
| | | | | | | | | | | | | | This was very, very obvious when using a debug build of PHP to build the manual! Fixes bug #70571 (Memory leak in sqlite3_do_callback).
* | Useless ZVAL_UNDEFXinchen Hui2015-09-091-2/+1
| |
* | SQLite3::open/__construct has 2 optional argsRasmus Lerdorf2015-07-071-1/+1
| |
* | Merge branch 'PHP-5.6'Xinchen Hui2015-07-071-2/+10
|\ \ | |/ | | | | | | Conflicts: ext/sqlite3/sqlite3.c
| * Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())Xinchen Hui2015-07-071-2/+10
| |
* | Switch position of ce in exception ce variable namesAaron Piotrowski2015-07-031-8/+8
| |