archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
128150 commits 526 branches 1434 tags 865 MiB
Commit graph

616 commits

Author SHA1 Message Date
Dmitry Stogov
1f3a5b4501 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed ZTS build
 2016-11-16 16:47:22 +03:00
Dmitry Stogov
99e5d6c4a5 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
 2016-11-16 16:47:05 +03:00
Christoph M. Becker
07ed7b5198 Merge branch 'PHP-7.1' 2016-11-16 12:08:16 +01:00
Christoph M. Becker
c5abb87322 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-16 12:02:29 +01:00
Christoph M. Becker
936cafe33e Merge branch 'PHP-5.6' into PHP-7.0 2016-11-16 12:00:39 +01:00
Christoph M. Becker
eb570294a2 Fix #73530: Unsetting result set may reset other result set 
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.
 2016-11-16 11:49:04 +01:00
Christoph M. Becker
531eedf38f Merge branch 'PHP-7.1' 2016-11-14 16:09:40 +01:00
Christoph M. Becker
d6c36e9af7 Update to SQLite 3.15.1 2016-11-14 14:55:13 +01:00
Anatol Belski
47d044b1ad Merge branch 'PHP-7.1' 
* PHP-7.1:
  Enable FTS4 and FTS5 for bundled libsqlite
 2016-11-08 02:36:05 +01:00
Anatol Belski
ed12167edf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Enable FTS4 and FTS5 for bundled libsqlite
 2016-11-08 02:35:33 +01:00
Anatol Belski
ef55a4b5b3 Enable FTS4 and FTS5 for bundled libsqlite 
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.
 2016-11-08 02:26:43 +01:00
Kalle Sommer Nielsen
f38834a180 Fix compiler warnings, always cast to zend_long from sqlite3_int64 when converting to a zval 2016-10-20 10:57:38 +02:00
Kalle Sommer Nielsen
6ca38e8cf8 Ignore the return value of sqlite3->busyTimeout() if their "API Armor" is 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
 2016-10-20 10:56:08 +02:00
Christoph M. Becker
e147eeb4bc Merge branch 'PHP-7.1' 2016-10-18 00:02:18 +02:00
Christoph M. Becker
32123167d1 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-18 00:01:32 +02:00
Christoph M. Becker
0b596f81b8 Merge branch 'PHP-5.6' into PHP-7.0 
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
 2016-10-17 23:38:28 +02:00
Christoph M. Becker
86e603a664 Fix #73333: 2147483647 is fetched as string 
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>.
 2016-10-17 23:34:41 +02:00
Christoph M. Becker
8f299a9673 Merge branch 'PHP-7.1' 2016-10-15 19:46:32 +02:00
Christoph M. Becker
663491b9ba Update to SQLite 3.15.0 2016-10-15 19:46:00 +02:00
Anatol Belski
1382e88ac1 upgrade bundled sqlite to 3.14.2 2016-09-13 15:44:21 +02:00
Anatol Belski
b1cd3ade55 Merge branch 'PHP-7.1' 
* PHP-7.1:
  add test for bug #73068
 2016-09-13 15:31:02 +02:00
Anatol Belski
86d6f29e8f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add test for bug #73068
 2016-09-13 15:30:35 +02:00
Anatol Belski
5163925796 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #73068
 2016-09-13 15:29:46 +02:00
Anatol Belski
248f8c3a91 add test for bug #73068 2016-09-13 15:28:28 +02:00
Christoph M. Becker
4cec961170 Merge branch 'PHP-7.1' 2016-09-13 13:40:48 +02:00
Christoph M. Becker
07aab07ce5 Update to SQLite 3.14.2 2016-09-13 13:40:18 +02:00
Christoph M. Becker
2c91684394 Replace dirname(__FILE__) with __DIR__ in tests 2016-09-03 00:56:09 +02:00
Christoph M. Becker
f2ee4dec99 Merge branch 'PHP-7.1' 2016-09-03 00:41:33 +02:00
Christoph M. Becker
b8d26ebb9a Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 00:40:05 +02:00
Christoph M. Becker
f3dc00fdfb Merge branch 'PHP-5.6' into PHP-7.0 2016-09-03 00:30:05 +02:00
Christoph M. Becker
c83bdb8e6a Make test case more resilient 
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>.
 2016-09-03 00:24:30 +02:00
Christoph M. Becker
a565f06d89 Merge branch 'PHP-7.1' 2016-09-02 18:00:06 +02:00
Christoph M. Becker
8f110ee4dc Update to SQLite 3.14.1 2016-09-02 17:58:16 +02:00
Christoph M. Becker
67153d644d Fix typo 2016-09-02 17:34:11 +02:00
Christoph M. Becker
24fdffdacb Update to SQLite 3.14.0 2016-08-10 18:09:38 +02:00
Christoph M. Becker
81c25abd25 Update to SQLite3 3.13.0 2016-07-28 16:39:24 +02:00
Christoph M. Becker
be11563fa2 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-27 16:54:27 +02:00
Christoph M. Becker
23c359c276 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/sqlite3/sqlite3.c
 2016-07-27 16:48:29 +02:00
Christoph M. Becker
cc125f277b Implement #72653: SQLite should allow opening with empty filename 
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.
 2016-07-27 16:41:03 +02:00
Christoph M. Becker
ac0bbea3a8 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-25 17:15:10 +02:00
Christoph M. Becker
ccf39dd552 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/sqlite3/sqlite3.c
#	ext/sqlite3/tests/bug72668.phpt
 2016-07-25 17:07:41 +02:00
Christoph M. Becker
64e3e932fc Further fixes wrt. bug #72668 
Not only SQLite3::querySingle(), but also SQLite3::query() and
SQLite3Stmt::execute() were affected.
 2016-07-25 17:03:10 +02:00
Xinchen Hui
088905bf60 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)
 2016-07-25 20:28:57 +08:00
Xinchen Hui
f5e56cf970 Fixed bug #72668 (Spurious warning when exception is thrown in user defined function) 2016-07-25 20:28:39 +08:00
Christoph M. Becker
ee07e23e8e Fix SQLite3 header files 
While sqlite3.c had already been updated to 3.13.0, the header files had
been forgotten.
 2016-07-25 10:27:21 +02:00
Xinchen Hui
24d0211b32 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)
 2016-07-11 11:51:34 +08:00
Xinchen Hui
a19655cfe3 Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash) 2016-07-11 11:51:19 +08:00
Christoph M. Becker
0d0f5976d8 Merge branch 'PHP-7.0' 2016-06-27 17:18:44 +02:00
Christoph M. Becker
0f03224d59 Merge branch 'PHP-5.6' into PHP-7.0 2016-06-27 17:09:55 +02:00
Christoph M. Becker
57940605da Fix #70628: Clearing bindings on an SQLite3 statement doesn't work 
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.
 2016-06-27 17:06:27 +02:00