summaryrefslogtreecommitdiff
path: root/ext/mysqlnd
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug #70572 segfault in mysqlnd_connectAndrey Hristov2015-09-251-2/+4
|
* Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the serverAndrey Hristov2015-09-235-0/+13
|
* Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a serverSergei Turchanov2015-09-091-0/+23
| | | | | libmysqlclient activates TCP keep-alive when connecting to a server. PHP mysqlnd extension must do the same to maintain compatibility.
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-07-071-23/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Better fix for bug #69958 Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/phar/phar_object.c
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-07-071-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c
| | * Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)Stanislav Malyshev2015-07-071-25/+40
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-07-061-22/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c
| | * | Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)Stanislav Malyshev2015-07-061-25/+40
| | |/
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-011-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix sizeof size
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-02-011-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: fix sizeof size
| | * fix sizeof sizeStanislav Malyshev2015-02-011-1/+1
| | |
| * | Patch commit d9f85373e32 by moving the float_to_double function toKeyur Govande2015-01-262-2/+62
| | | | | | | | | | | | a header file.
| * | Fix for bugs #68114 (Build fails on OS X due to undefined symbols)Keyur Govande2015-01-262-79/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors). The patch removes support for Decimal floating point numbers and now defaults to using similar logic as what libmysqlclient does: convert a 4 byte floating point number into a string, and then the string into a double. The quirks of MySQL are maintained as seen in Field_Float::val_str()
| * | Bump yearXinchen Hui2015-01-1537-37/+37
| | |
* | | Patch commit d9f85373e32 by moving the float_to_double function toKeyur Govande2015-01-262-2/+62
| | | | | | | | | | | | a header file.
* | | Fix for bugs #68114 (Build fails on OS X due to undefined symbols)Keyur Govande2015-01-262-79/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors). The patch removes support for Decimal floating point numbers and now defaults to using similar logic as what libmysqlclient does: convert a 4 byte floating point number into a string, and then the string into a double. The quirks of MySQL are maintained as seen in Field_Float::val_str()
* | | bump yearXinchen Hui2015-01-1537-37/+37
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-12-261-1/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
| * | Fix for failing tests. gcc 4.8.3 would optimize away the assigment.Keyur Govande2014-12-261-1/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-10-071-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Add to NEWS Fix for bug #68114 (Build fails on OS X due to undefined symbols)
| * | Fix for bug #68114 (Build fails on OS X due to undefined symbols)Keyur Govande2014-10-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width decimals and fails with undefined symbols errors like ___extendsddf. If configure used gcc for compiling it would notice and mark the feature HAVE_DECIMAL_FP_SUPPORT as unsupported. But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2) instead, which doesn't support fixed-width decimals either, but the code compiles and links just fine. I suspect it may have something to do with the llvm backend printed in the version. Lacking the time to debug this further, the patch fixes the issue by checking the expected output when fixed-width decimal support is present and correctly implemented.
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-101-1/+11
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix precision when fetching float through mysqlnd
| * | fix precision when fetching float through mysqlndAnatol Belski2014-09-101-1/+11
| | | | | | | | | | | | fixes failing ext/mysqli/tests/010.phpt
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fixed DBG_INF macro name
| * | fixed DBG_INF macro nameAnatol Belski2014-08-271-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: typofixes
| * | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: typofixes
| | * typofixesVeres Lajos2014-08-171-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-08-152-4/+71
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Update NEWS Fix another failing test Add NEWS Fix failing tests Patch for bug #67839 (mysqli does not handle 4-byte floats correctly) Conflicts: ext/mysqli/tests/mysqli_change_user.phpt
| * | Merge branch 'PHP-5.4' into PHP-5.5Keyur Govande2014-08-152-4/+71
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Add NEWS Fix failing tests Patch for bug #67839 (mysqli does not handle 4-byte floats correctly) Conflicts: ext/mysqli/tests/table.inc
| | * Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)Keyur Govande2014-08-142-4/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the patch, a value of 9.99 in a FLOAT column came out of mysqli as 9.9998998641968. This is because it would naively cast a 4-byte float into PHP's internal 8-byte double. To fix this, with GCC we use the built-in decimal support to "up-convert" the 4-byte float to a 8-byte double. When that is not available, we fall back to converting the float to a string and then converting the string to a double. This mimics what MySQL does.
* | | Use callback structureAndrey Hristov2014-08-062-5/+7
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-08-061-17/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: ext/fileinfo/data_file.c ext/fileinfo/libmagic/softmagic.c ext/fileinfo/magicdata.patch
| * | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-061-17/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: NEWS configure.in main/php_version.h
| | * Fix handling of multi-result sets with PS...used to clean not onlyAndrey Hristov2014-08-061-17/+34
| | | | | | | | | | | | the result set but the whole PS.
* | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-07-311-1/+1
|\ \ \ | |/ /
| * | Fix wrong lenght sizeAndrey Hristov2014-07-311-1/+1
| | |
* | | Easier to readAndrey Hristov2014-07-161-24/+24
| | |
* | | Add some trace info as well as update CLIENT_ flagsAndrey Hristov2014-07-163-33/+70
| | |
* | | Add support for gb18030/MySQL 5.7Andrey Hristov2014-06-181-4/+46
| | |
* | | fix crash in MINFO when no mysqlnd plugins are loadedAnatol Belski2014-04-141-1/+1
| | |
* | | fix syntax error in vc++Anatol Belski2014-04-111-1/+1
| | |
* | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-04-103-37/+88
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_begin_transaction.phpt
| * | | Remove some usages of hashtable internalsNikita Popov2014-04-092-8/+8
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-201-52/+71
| |\ \ \ | | |/ /
| | * | Emit a warning in case of unallowed characters. Fix another place thisAndrey Hristov2014-03-201-52/+71
| | | | | | | | | | | | | | | | code is used - reuse
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-201-4/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: ext/mysqli/mysqli_api.c
| | * | don't replace with ?, just skip itAndrey Hristov2014-03-201-4/+1
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-191-12/+47
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: NEWS configure.in ext/mysqli/mysqli_api.c main/php_version.h
| | * | Fix problem with mysqli_commt()/mysqli_rollback()Andrey Hristov2014-03-191-12/+47
| | | |