summaryrefslogtreecommitdiff
path: root/ext/mysqli
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-171-0/+65
|\
| * Add test for bug #72489Nikita Popov2016-09-171-0/+65
| |
* | add test for bug #72701Anatol Belski2016-07-291-0/+32
| |
* | Fix for bug #71863 Segfault when EXPLAIN with "Unknown column" errorAndrey Hristov2016-07-251-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | The reason was that after the big refactoring of mysqlnd at the end of last year code that is initializing the error_info structure in the result set was not added. It existed already for connections and PS. The code that segfaults is hit only with MariaDB because MariaDB sends full metadata about the EXPLAIN query + EOF packet and only then it sends an error packet. MySQL doesn't do that but sends directly an error which is caught (by different code path). As errors during execution (which means after sending meta) are pretty rare there was no test case of MySQL to catch it.
* | Merge branch 'throw-error-in-extensions'Aaron Piotrowski2016-07-051-2/+2
|\ \
| * | Replace zend_ce_error with NULL and replace more E_ERROR with thrown ErrorAaron Piotrowski2016-06-131-2/+2
| | |
| * | Merge branch 'master' into throw-error-in-extensionsAaron Piotrowski2016-06-1041-253/+618
| |\ \
| * | | Convert E_ERROR to thrown Error in extensionsAaron Piotrowski2015-07-051-2/+2
| | | |
* | | | Fixed compilation warningsDmitry Stogov2016-06-281-4/+0
| | | |
* | | | Fixed compilation warningsDmitry Stogov2016-06-226-9/+10
| | | |
* | | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-212-5/+5
| | | | | | | | | | | | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
* | | | Implemented RFC: Replace "Missing argument" warning with "Too few arguments" ↵Dmitry Stogov2016-06-162-23/+29
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception Squashed commit of the following: commit 8b45fa2acb8cd92542a39e1e4720fe1f4fabc26c Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jun 16 01:52:50 2016 +0300 Separate slow path of ZEND_RECV into a cold function. commit 9e18895ee59c64c93a96b1ba3061355c4663e962 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jun 15 23:26:28 2016 +0300 Required argument can't be IS_UNDEF anymore. commit 662db66e3943d4455c65e4f987bb54abf724ecb2 Author: Dmitry Stogov <dmitry@zend.com> Date: Tue May 31 17:14:50 2016 +0300 Replace "Missing argument" warning by "Too few arguments" exception.
* | | Merge branch 'PHP-7.0'Anatol Belski2016-05-092-125/+4
|\ \ \ | | |/ | |/| | | | | | | | | | * PHP-7.0: Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor" Revert "Backport patch for bug #71820"
| * | Revert "Fixed bug #71820 pg_fetch_object bind parameters before call ↵Anatol Belski2016-05-092-125/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | constructor" This reverts commit b4eedd128ba9f61be08a50c94afd72837d7cf70b. This fixed bug #72151, and reverts the fix for bug #71820. See also bug #50636 and #49521 for the history.
* | | - get rid of EG(scope). zend_get_executed_scope() should be used instead.Dmitry Stogov2016-04-281-1/+1
| | | | | | | | | | | | - ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
* | | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵Dmitry Stogov2016-04-271-1/+0
| | | | | | | | | | | | but is never used.
* | | Merge branch 'PHP-7.0'Anatol Belski2016-03-172-4/+125
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #71820 pg_fetch_object bind parameters before call constructor
| * | Fixed bug #71820 pg_fetch_object bind parameters before call constructorAnatol Belski2016-03-172-4/+125
| | | | | | | | | | | | | | | | | | If we want to fetch into an object of a custom class that implemens __set handler, the corstructor has to be called first. The data passed to the constructor can be possibly required in __set handler.
* | | Merge branch 'PHP-7.0'Andrey Hristov2016-03-161-3/+3
|\ \ \ | |/ /
| * | Fix emails in headers. @mysql.com addresses are no more since many years.Andrey Hristov2016-03-161-3/+3
| | |
* | | Merge branch 'PHP-7.0'Nikita Popov2016-03-032-2/+2
|\ \ \ | |/ /
| * | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | | | | | | | | | Also re bug #71575.
* | | Removed zend_fcall_info.symbol_tableDmitry Stogov2016-03-021-1/+0
| | |
* | | Remove version checksNikita Popov2016-01-303-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP_VERSION_ID PHP_API_VERSION ZEND_MODULE_API_NO PHP_MAJOR_VERSION, PHP_MINOR_VERSION ZEND_ENGINE_2 I've left litespeed alone, as it seems to genuinely maintain support for many PHP versions.
* | | Remove HAVE_SPL checksNikita Popov2016-01-303-14/+1
| | | | | | | | | | | | | | | | | | SPL is always built. Also clean up spl_ce_RuntimeException handling in PDO.
* | | Merge branch 'PHP-7.0'Julien Pauli2016-01-041-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Happy new year (Update copyright to 2016)
| * | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-01-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) Conflicts: ext/json/php_json_encoder.h sapi/continuity/capi.c
| | * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-031-1/+1
| | | |
* | | | - Make functions static, as they are not needed to be public - exportedAndrey Hristov2016-01-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | through a structure - Fixed typo in statistic name - Added 2 static functions for copying a MYSQLND_CSTRING and converting a CSTRING to STRING.
* | | | Merge branch 'PHP-7.0'Lior Kaplan2016-01-0116-16/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Update header to PHP Version 7 Happy new year (Update copyright to 2016) Happy new year (Update copyright to 2016)
| * | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-0116-16/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| | * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-0116-16/+16
| | | |
* | | | Merge branch 'PHP-7.0'Xinchen Hui2015-11-271-0/+62
|\ \ \ \ | |/ / /
| * | | Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)Xinchen Hui2015-11-271-0/+62
| | | |
* | | | Merge branch 'PHP-7.0'Xinchen Hui2015-11-171-2/+12
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2015-11-171-2/+12
| |\ \ \ | | |/ /
| | * | Improve the testXinchen Hui2015-11-171-2/+12
| | | |
* | | | Merge branch 'PHP-7.0'Xinchen Hui2015-11-164-6/+86
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2015-11-164-6/+86
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: ext/mysql/php_mysql.c
| | * | Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)Xinchen Hui2015-11-164-6/+86
| | | | | | | | | | | | | | | | Actually, this only be fixed if php uses mysqlnd
* | | | MNDR:Andrey Hristov2015-11-122-4/+10
|/ / / | | | | | | | | | | | | | | | - cleanup in mysqlnd_result.c - switch from zend_ulong to size_t for lengths. Accordingly change mysqli and pdo_mysql for this.
* | | Fix mysqli testsAndrey Hristov2015-10-282-5/+4
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Andrey Hristov2015-10-275-14/+14
|\ \ \ | |/ /
| * | Another Fix for Bug #68344 MySQLi does not provide way to disable peer ↵Andrey Hristov2015-10-275-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certificate validation Added the possibility to explicitly state that the peer certificate should not be checked. Back to the default - checking the certificate. Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT) If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag, then no verification takes place.
* | | Merge branch 'PHP-5.6' into PHP-7.0Andrey Hristov2015-10-222-0/+6
|\ \ \ | |/ /
| * | Improve fix for Bug #68344 MySQLi does not provide way to disable peer ↵Andrey Hristov2015-10-222-0/+6
| | | | | | | | | | | | certificate validation
* | | Merge branch 'PHP-5.6' into PHP-7.0Andrey Hristov2015-10-214-65/+215
|\ \ \ | |/ /
| * | Fix for Bug #68344 MySQLi does not provide way to disable peer certificate ↵Andrey Hristov2015-10-211-0/+40
| | | | | | | | | | | | validation
| * | Update the certificates needed for the mysqli testsAndrey Hristov2015-10-213-65/+175
| | |
| * | fix testAnatol Belski2015-10-121-0/+4
| | |
View Lorry Controller Status