summaryrefslogtreecommitdiff
path: root/ext/sqlite3
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headers to 2017Sammy Kaye Powers2017-01-043-3/+3
|
* 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-292-32/+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.0' of git.php.net:php-src into PHP-7.0Dmitry Stogov2016-11-161-3/+0
|\ \ | | | | | | | | | * 'PHP-7.0' of git.php.net:php-src:
| * \ Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-11-162-3/+32
| |\ \ |/ / / | | _
| * Fix #73530: Unsetting result set may reset other result setChristoph M. Becker2016-11-162-4/+32
| | | | | | | | | | | | | | | | | | 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.
* | Enable FTS4 and FTS5 for bundled libsqliteAnatol Belski2016-11-082-2/+2
| | | | | | | | | | | | | | FTS3 is already enabled by default, and the other FTS versions seems just to have been missed. Given that, the other FTS plugins look like a low impact so worth a try. The current bundled libsqlite versions in 7.x are proven stable already and support FTS5.
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-10-174-4/+37
|\ \ | |/ | | | | We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
| * Fix #73333: 2147483647 is fetched as stringChristoph M. Becker2016-10-174-4/+37
| | | | | | | | | | | | | | | | | | 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>.
* | upgrade bundled sqlite to 3.14.2Anatol Belski2016-09-133-2948/+4169
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-131-0/+37
|\ \ | |/ | | | | | | * PHP-5.6: add test for bug #73068
| * add test for bug #73068Anatol Belski2016-09-131-0/+37
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-031-0/+2
|\ \ | |/
| * Make test case more resilientChristoph M. Becker2016-09-031-0/+2
| | | | | | | | | | | | | | When ran from a root directory the test case failed, because the open_basedir restriction for "../[…]" won't kick in. Therefore we change the current working directory to the test case's directory, as discussed on internals, see <http://news.php.net/php.internals/95585>.
* | Update to SQLite3 3.13.0Christoph M. Becker2016-07-283-12657/+56019
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-272-15/+9
|\ \ | |/ | | | | | | # Resolved conflicts: # ext/sqlite3/sqlite3.c
| * Implement #72653: SQLite should allow opening with empty filenameChristoph M. Becker2016-07-272-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-5.6' into PHP-7.0Christoph M. Becker2016-07-252-6/+27
|\ \ | |/ | | | | | | | | # Resolved conflicts: # ext/sqlite3/sqlite3.c # ext/sqlite3/tests/bug72668.phpt
| * Further fixes wrt. bug #72668Christoph M. Becker2016-07-252-3/+50
| | | | | | | | | | Not only SQLite3::querySingle(), but also SQLite3::query() and SQLite3Stmt::execute() were affected.
* | Fixed bug #72668 (Spurious warning when exception is thrown in user defined ↵Xinchen Hui2016-07-252-1/+27
| | | | | | | | function)
* | Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)Xinchen Hui2016-07-112-1/+24
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-06-272-0/+61
|\ \ | |/
| * Fix #70628: Clearing bindings on an SQLite3 statement doesn't workChristoph M. Becker2016-06-272-0/+61
| | | | | | | | | | 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 bug #68849 bindValue is not using the right data typeAnatol Belski2016-04-122-0/+101
| |
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | | | | | Also re bug #71575.
* | 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
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-013-3/+3
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-013-3/+3
| |
* | Fixed Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead ↵Xinchen Hui2015-12-072-2/+22
| | | | | | | | of internal buffer)
* | fix crash in sqlite when executing with bound stream paramAnatol Belski2015-11-052-4/+44
| | | | | | | | 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-072-2/+38
|\ \ | |/ | | | | | | Conflicts: ext/sqlite3/sqlite3.c
| * Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())Xinchen Hui2015-07-072-2/+38
| |
* | Switch position of ce in exception ce variable namesAaron Piotrowski2015-07-031-8/+8
| |
* | Change zend_exception_get_default() to zend_exception_ceAaron Piotrowski2015-07-031-8/+8
| |
* | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-24/+24
| | | | | | | | semantick changes).
* | Fixed bug #69897 (segfault when manually constructing SQLite3Result)Kalle Sommer Nielsen2015-06-221-1/+1
| |
* | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-06-142-2207/+4818
|\ \ | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt
| * \ Merge branch 'PHP-5.6'Lior Kaplan2015-06-082-2207/+4818
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Upgrade bundled sqlite to 3.8.10.2
| | * Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2015-06-082-2207/+4818
| | |\ | | | | | | | | | | | | | | | | * PHP-5.5: Upgrade bundled sqlite to 3.8.10.2
| | | * Upgrade bundled sqlite to 3.8.10.2Lior Kaplan2015-06-082-2207/+4818
| | | | | | | | | | | | | | | | Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
* | | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-05-173-3/+3
|\ \ \ \ | |/ / /
| * | | Tweak uncaught exception message displayNikita Popov2015-05-173-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions.
* | | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-05-171-6/+6
|\ \ \ \ | |/ / /
| * | | fix typosolshevskiy872015-05-131-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
* | | | Updated tests to reflect exception class changes.Aaron Piotrowski2015-05-161-1/+1
|/ / /