summaryrefslogtreecommitdiff
path: root/ext/sqlite3
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / /
* | | Fixed access to uninitialized value (in case of exception)Dmitry Stogov2015-04-081-1/+1
| | |
* | | Always throw TypeException on throwing zpp failuresNikita Popov2015-04-062-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to report FAILURE errors using a TypeException instead of a Warning, like it would happen in strict mode. Adds a zend_parse_parameters_throw() convenience function, which invokes zpp with this flag. Converts all cases I could identify, where we currently have throwing zpp usage in constructors and replaces them with this API. Error handling is still replaced to EH_THROW in some cases to handle other, domain-specific errors in constructors.
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-052-1/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #66550 (SQLite prepared statement use-after-free) Conflicts: ext/sqlite3/sqlite3.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-04-052-0/+39
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Fix bug #66550 (SQLite prepared statement use-after-free)
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-04-052-0/+39
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #66550 (SQLite prepared statement use-after-free)
| | | * Fix bug #66550 (SQLite prepared statement use-after-free)Stanislav Malyshev2015-04-052-0/+39
| | | |
| | | * Bump yearXinchen Hui2014-01-033-3/+3
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-03-253-1889/+3744
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3 fix dir separator in test
| | * | Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3Anatol Belski2015-03-252-1888/+3743
| | | |
| | * | fix dir separator in testAnatol Belski2015-03-251-1/+1
| | | |
* | | | updated bundled libsqlite to 3.8.8.3Anatol Belski2015-03-253-6766/+8621
| | | |
* | | | Merge branch 'pull-request/1091'Stanislav Malyshev2015-03-222-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/1091: Stop trying to call the callback after it has thrown an exception. Also, as an exception has been thrown, there is no need to have a separate error message. Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/tests/bug68760.phpt
| * | | | Stop trying to call the callback after it has thrown an exception. Also, as ↵Danack2015-02-162-9/+13
| | | | | | | | | | | | | | | | | | | | an exception has been thrown, there is no need to have a separate error message.
| * | | | Merge branch 'sqlite3_exceptionSegfault56' into sqlite3_exception7Danack2015-02-161-0/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sqlite3_exceptionSegfault56: Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/sqlite3.c
| | * | | | Fix freeing null segfault. Added test for behaviour.Danack2015-01-062-6/+43
| | | | | |
* | | | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-03-221-0/+36
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix #68760: Fix freeing null segfault. Added test for behaviour. Fix #68760: Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/sqlite3.c
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-221-0/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix #68760: Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/tests/bug68760.phpt
| | * | | | Fix #68760: Fix freeing null segfault. Added test for behaviour.Danack2015-03-222-6/+47
| | | | | |
| | * | | | Bump yearXinchen Hui2015-01-154-4/+4
| | | | | |
| * | | | | Fix #68760: Fix freeing null segfault. Added test for behaviour.Danack2015-03-222-6/+43
| | | | | |
| * | | | | bump yearXinchen Hui2015-01-154-4/+4
| | | | | |
* | | | | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-162-3/+3
| |_|/ / / |/| | | | | | | | | | | | | | which also comply with the current semantics for such macros
* | | | | Move zend_object->guards into additional slot of ↵Dmitry Stogov2015-02-041-3/+3
| | | | | | | | | | | | | | | | | | | | zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
* | | | | bump yearXinchen Hui2015-01-154-4/+4
| | | | |
* | | | | Merge branch 'PHP-5.6'Anatol Belski2015-01-121-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #68771 SQL syntax error in sqlite lib
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-121-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #68771 SQL syntax error in sqlite lib
| | * | | Fixed bug #68771 SQL syntax error in sqlite libAnatol Belski2015-01-121-1/+1
| | | | |
* | | | | trailing whitespace removalStanislav Malyshev2015-01-105-4981/+4981
| | | | |
* | | | | Merge branch 'PHP-5.6'Julien Pauli2015-01-091-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS Fix bug #68260
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-01-091-1/+1
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | * PHP-5.5: Fix bug #68260
| | * | Fix bug #68260Julien Pauli2015-01-091-1/+1
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-86/+80
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-063-6217/+11704
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (35 commits) Fixed bug #68398 msooxml matches too many archives Fix zpp call in apache_getenv() Drop unnecessary zval containers fixed test C89 compat add include for missing localeconv_r proto updated NEWS Fixed bug #65230 setting locale randomly broken Fix compilation error (ref #68424) Removed useless handlers Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers. Revert unintentional docblock change Restored zip/oci8 PHP 4 code, add PHP 7 checks Note macro removal in UPGRADING.INTERNALS Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) Zend Engine 3 Updated NEWS Updated NEWS Updated NEWS Start adding new attribute to control multi statements ...
| * \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-12-053-6217/+11704
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS . Fixed bug #68120 Update bundled libsqlite
View Lorry Controller Status