| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
* PHP-5.6:
Revert "Fix #73530: Unsetting result set may reset other result set"
# Conflicts:
# ext/sqlite3/sqlite3.c
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| | |
| | |
| | | |
* 'PHP-7.0' of git.php.net:php-src:
|
| |\ \
|/ / /
| | _ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| | |
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>.
|
| | |
|
|\ \
| |/
| |
| |
| | |
* PHP-5.6:
add test for bug #73068
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
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>.
|
| | |
|
|\ \
| |/
| |
| |
| | |
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| |
| |
| | |
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
# ext/sqlite3/tests/bug72668.phpt
|
| |
| |
| |
| |
| | |
Not only SQLite3::querySingle(), but also SQLite3::query() and
SQLite3Stmt::execute() were affected.
|
| |
| |
| |
| | |
function)
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| | |
Also re bug #71575.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
ext/sqlite3/sqlite3.c
|
| | |
|
|\ \
| |/
| |
| |
| | |
* PHP-5.6:
Happy new year (Update copyright to 2016)
|
| | |
|
| |
| |
| |
| | |
of internal buffer)
|
| |
| |
| |
| | |
rel #70862
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
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).
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
ext/sqlite3/sqlite3.c
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
semantick changes).
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
# Conflicts:
# Zend/zend_language_scanner.c
# Zend/zend_language_scanner.l
# ext/simplexml/tests/SimpleXMLElement_xpath.phpt
|
| |\ \
| | |/
| | |
| | |
| | | |
* PHP-5.6:
Upgrade bundled sqlite to 3.8.10.2
|
| | |\
| | | |
| | | |
| | | |
| | | | |
* PHP-5.5:
Upgrade bundled sqlite to 3.8.10.2
|
| | | |
| | | |
| | | |
| | | | |
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
|
|\ \ \ \
| |/ / / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|\ \ \ \
| |/ / / |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
|
|/ / / |
|