Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-05 | 3 | -6217/+11704 |
|\ | | | | | | | | | | | | | | | * PHP-5.5: . Fixed bug #68120 Update bundled libsqlite Conflicts: ext/sqlite3/libsqlite/sqlite3.c | ||||
| * | . Fixed bug #68120 Update bundled libsqlite | Anatol Belski | 2014-12-05 | 3 | -6213/+11700 |
| | | |||||
* | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-23 | 1 | -63/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c | ||||
* | | Add object initialization checks for sqlite3 classes | Stanislav Malyshev | 2014-07-26 | 1 | -9/+31 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-04-11 | 2 | -1848/+2495 |
|\ \ | |/ | | | | | | | * PHP-5.5: Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3 | ||||
| * | Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3 | Anatol Belski | 2014-04-11 | 2 | -1848/+2495 |
| | | |||||
| * | updated libsqlite to 3.8.3.1 in 5.5 branch, too | Anatol Belski | 2014-03-10 | 4 | -18660/+36680 |
| | | |||||
| * | Bump year | Xinchen Hui | 2014-01-03 | 3 | -3/+3 |
| | | |||||
* | | removed the libsqlite patch as it's not relevant anymore | Anatol Belski | 2014-03-09 | 1 | -18/+0 |
| | | |||||
* | | updated bundled libsqlite to 3.8.3.1 | Anatol Belski | 2014-03-09 | 3 | -18642/+36680 |
| | | |||||
* | | Bump year | Xinchen Hui | 2014-01-03 | 3 | -3/+3 |
| | | |||||
* | | Implement variadic function syntax | Nikita Popov | 2013-09-26 | 1 | -1/+1 |
| | | | | | | | | As per RFC: https://wiki.php.net/rfc/variadics | ||||
* | | let the libsqlite3 symbols be exported in dll | Anatol Belski | 2013-09-17 | 1 | -1/+1 |
|/ | |||||
* | Fix long-standing visual pain point: the misalignment of './configure help' ↵ | Christopher Jones | 2013-08-06 | 1 | -1/+1 |
| | | | | | | text. Whitespace changes and a couple of grammar fixes. | ||||
* | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 1 | -6/+6 |
|\ | | | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c | ||||
| * | non living code related typo fixes | Veres Lajos | 2013-08-04 | 1 | -6/+6 |
| | | |||||
| * | typo fixes | Veres Lajos | 2013-07-15 | 1 | -13/+13 |
| | | |||||
| * | less serious compatAbility fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
| | | |||||
| * | typos (orig) | Veres Lajos | 2013-07-15 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -35/+35 |
| | | | | | | | | | | * pull-request/341: (23 commits) typofixes | ||||
* | | typo fixes | Veres Lajos | 2013-07-15 | 1 | -13/+13 |
| | | |||||
* | | typos (orig) | Veres Lajos | 2013-07-15 | 1 | -2/+2 |
| | | |||||
* | | less serious compatAbility fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -35/+35 |
| | | | | | | | | | | * pull-request/341: (23 commits) typofixes | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-06-10 | 2 | -4/+4 |
|\ \ | |/ | | | | | | | | | * PHP-5.4: typo fixes (argument) typo fixes (accommodate, parameter) | ||||
| * | typo fixes (argument) | Veres Lajos | 2013-06-10 | 1 | -1/+1 |
| | | |||||
| * | typo fixes (accommodate, parameter) | Veres Lajos | 2013-06-10 | 2 | -3/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Lars Strojny | 2013-01-14 | 3 | -0/+66 |
|\ \ | |/ | |||||
| * | Fixed bug #63921: sqlite3::bindvalue and relative PHP functions aren't using ↵ | Lars Strojny | 2013-01-14 | 3 | -0/+66 |
| | | | | | | | | sqlite3_*_int64 API | ||||
| * | Happy New Year | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
| | | |||||
* | | Happy New Year | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2012-11-24 | 1 | -0/+3 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed Bug #63149 Feature missing with system SQLite | ||||
| * | Fixed Bug #63149 Feature missing with system SQLite | Remi Collet | 2012-11-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | In pdo_sqlite, getColumnMeta should return the table name. With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags) enable the feature in SQLite (function sqlite3_column_table_name). With system SQLite library, this fix detects if sqlite3_column_table_name is available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior. Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt | ||||
* | | Merge branch 'PHP-5.4' | Stanislav Malyshev | 2012-06-30 | 2 | -12/+12 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed the common misspelling of the word occurred (occured -> occurred) | ||||
| * | Fixed the common misspelling of the word occurred (occured -> occurred) | Marc Easen | 2012-06-30 | 2 | -12/+12 |
| | | |||||
* | | Merge branch 'PHP-5.4' | Johannes Schlüter | 2012-06-22 | 1 | -2/+5 |
|\ \ | |/ | | | | | | | * PHP-5.4: Improve check for :memory: pseudo-filename in SQlite | ||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2012-06-22 | 1 | -2/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Improve check for :memory: pseudo-filename in SQlite Conflicts: ext/sqlite3/sqlite3.c | ||||
| | * | Improve check for :memory: pseudo-filename in SQlite | Johannes Schlüter | 2012-06-22 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Anatoliy Belsky | 2012-04-26 | 2 | -0/+40 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-04-26 | 2 | -0/+40 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails Conflicts: ext/sqlite3/tests/sqlite3_15_open_error.phpt | ||||
| | * | Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails | Anatoliy Belsky | 2012-04-26 | 2 | -0/+40 |
| | | | |||||
| | * | Missed the test | Rasmus Lerdorf | 2012-01-29 | 1 | -0/+44 |
| | | | |||||
| | * | Good patch from Brad Dewar that adds missing createCollation() | Rasmus Lerdorf | 2012-01-29 | 3 | -1/+133 |
| | | | | | | | | | | | | | | | method. Fixes bug #60871 and is related to bug #55226 | ||||
| | * | - Year++ | Felipe Pena | 2012-01-01 | 3 | -3/+3 |
| | | | |||||
| | * | - add skipif | Pierre Joye | 2011-09-06 | 1 | -0/+2 |
| | | | |||||
| | * | - add skipif | Pierre Joye | 2011-09-06 | 1 | -0/+2 |
| | | | |||||
| | * | Fix another broken test. root can read 0200 files. | Rasmus Lerdorf | 2011-08-29 | 1 | -1/+6 |
| | | | |||||
| | * | Fixed memset usage (identified by coverity) | Ilia Alshanetsky | 2011-08-10 | 1 | -3/+3 |
| | | | |||||
| | * | Update SQLite3 to the latest version | Scott MacVicar | 2011-08-09 | 2 | -2600/+5315 |
| | | | |||||
| | * | Not our issue, but fixing here for now and reporting upstream | Rasmus Lerdorf | 2011-08-06 | 1 | -0/+1 |
| | | |