Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | NEWS 7.2.11PHP-7.2.11 | Sara Golemon | 2018-10-09 | 1 | -1/+1 |
| | |||||
* | Update NEWS for PHP 7.2.11RC1 | Sara Golemon | 2018-09-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'PHP-7.1' into PHP-7.2 | Sara Golemon | 2018-09-25 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-7.1: Fixed bug #76918 Repeated parameter name in arg info | ||||
| * | Fixed bug #76918 Repeated parameter name in arg info | Sara Golemon | 2018-09-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Terminate smart string correctly | Christopher Jones | 2018-09-24 | 1 | -2/+2 |
| | | | | | | | | This is related to Zend VM regression bug #75881. The regression was fixed in the VM, so there is no user visible change from the termination correction. | ||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 5 | -2/+125 |
|\ \ | |/ | |||||
| * | Make usable for PECL OCI8 release for PHP 7.x | Christopher Jones | 2018-09-24 | 5 | -2/+125 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Backport master branch comment typo fix | Christopher Jones | 2018-09-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 5 | -7/+7 |
|\ \ | |/ | |||||
| * | Make tests portable across PHP 7.x versions | Christopher Jones | 2018-09-24 | 5 | -7/+7 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Remove $id from phpinfo as already done in PHP-7.3 | Christopher Jones | 2018-09-24 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 151 | -462/+462 |
|\ \ | |/ | |||||
| * | And strip trailing tabs too... | Christopher Jones | 2018-09-24 | 151 | -462/+462 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 91 | -98/+95 |
|\ \ | |/ | |||||
| * | Sync EXPECT usage with PHP-7.3 | Christopher Jones | 2018-09-24 | 91 | -98/+95 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 267 | -624/+623 |
|\ \ | |/ | |||||
| * | Remove trailing whitespace to help keep branches in sync | Christopher Jones | 2018-09-24 | 267 | -624/+623 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christopher Jones | 2018-09-24 | 8 | -44/+44 |
|\ \ | |/ | |||||
| * | Remove trailing whitespace to help keep branches in sycn | Christopher Jones | 2018-09-24 | 8 | -44/+44 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Christoph M. Becker | 2018-09-22 | 3 | -2/+27 |
|\ \ | |/ | | | | | | | * PHP-7.1: Fix #66828: iconv_mime_encode Q-encoding longer than it should be | ||||
| * | Fix #66828: iconv_mime_encode Q-encoding longer than it should be | Christoph M. Becker | 2018-09-22 | 3 | -2/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the fix for bug 48289 has been applied, the algorithm to construct a Q-encoded-word has been optimistic, i.e. try to encode as many bytes that *may* fit in the remaining space, calculate the actual length of the Q-encoded word, and if it's too long, try again with a reduced size. However, the fix for the mentioned bug replaced this by a pessimistic algorithm, which always terminates[1] the for loop[2] during the first iteration (which renders the following 3 lines as dead code), and as such easily produces unnecessarily short encoded-words. Instead the proper fix for the bug would have been to make sure that `out_size` is always decremented, if the space isn't sufficient for the encoded-word. [1] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1421> [2] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1360> | ||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Nikita Popov | 2018-09-19 | 2 | -12/+12 |
|\ \ | |/ | |||||
| * | Fix getColumnMeta() test | Nikita Popov | 2018-09-19 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | Newer MySQL versions are stricter about invalid values. Three issues are fixed: * Don't use negative values with ZEROFILL. ZEROFILL implies UNSIGNED. * Use a legal TIMESTAMP value. TIMESTAMP does not accept a Unix timestamp. * Specify BIGINT values as strings, to avoid overflows. This is a cherry-pick of d2dc0a32911c0e08986da799ce11e18c3fa5ca57 from master. | ||||
| * | Fix intermittent failures in mysqli_stmt_bind_result_format.phpt | Nikita Popov | 2018-09-19 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | There were two distinct issues here: * $trend was compared against 'NULL' using !=, which does not work as intended in the case where $trend==0.0. * current_targets was declared as double(17,0), which means that the fractional part was rounded, so that the same comparison in SQL (rounded) and in PHP (not rounded) did not necessarily match. Please don't write mt_rand based tests, it takes ages to debug this crap... | ||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Nikita Popov | 2018-09-19 | 3 | -7/+24 |
|\ \ | |/ | |||||
| * | Fixed bug #76901 | Nikita Popov | 2018-09-19 | 3 | -7/+26 |
| | | | | | | | | | | | | | | get_method() may modify the object pointer passed to it if method forwarding is used. In this case we do not want to modify the passed zval, so make sure that we copy the object into a temporary first. | ||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Nikita Popov | 2018-09-18 | 2 | -3/+3 |
|\ \ | |/ | |||||
| * | Fix bug #75533: array_reduce is slow when $carry is large array | Manabu Matsui | 2018-09-18 | 2 | -3/+3 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2018-09-18 | 1 | -0/+5 |
|\ \ | |/ | | | | | | | * PHP-7.1: Add spectre switch for suitable vc14 versions | ||||
| * | Add spectre switch for suitable vc14 versions | Anatol Belski | 2018-09-18 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Pierrick Charron | 2018-09-17 | 2 | -1/+21 |
|\ \ | |/ | |||||
| * | Fix 76480: Use curl_multi_wait() so that timeouts are respected | Pierrick Charron | 2018-09-17 | 2 | -1/+21 |
| | | |||||
* | | Fix #76886: Can't build xmlrpc with expat | Thomas Petazzoni | 2018-09-15 | 2 | -0/+4 |
| | | | | | | | | We fix it by including "php.h" in the HAVE_LIBEXPAT case. | ||||
* | | Fixed bug #76800 (foreach inconsistent if array modified during loop) | Dmitry Stogov | 2018-09-14 | 3 | -3/+22 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2018-09-13 | 1 | -0/+2 |
|\ \ | |/ | | | | | | | * PHP-7.1: Sync version for vc++ 15.9 | ||||
| * | Sync version for vc++ 15.9 | Anatol Belski | 2018-09-13 | 1 | -0/+2 |
| | | |||||
* | | Backport changes for OpenSSL 1.1.1 CI integration | Anatol Belski | 2018-09-13 | 2 | -1/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add debug message for failing test parts (cherry picked from commit a45169a6ba54b13484d70cb474679c96347f779b) Show all unmatched errors when test failed (cherry picked from commit 70159652541c62b5f3bbb26da76b7e56987b2544) More possibly colliding libs to remove from the test image (cherry picked from commit 3008ad1a49210e4604522a987cbdd27a5a0a2c42) Remove colliding file from CI image (cherry picked from commit 6220d21c3420ff0d7366d410920ba5279fba3893) Fix typo (cherry picked from commit 24517d82cf8dc708d08bc77435ad418de4bdff4e) | ||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2018-09-12 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | * PHP-7.1: Improve error code matching | ||||
| * | Improve error code matching | Anatol Belski | 2018-09-12 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2018-09-12 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-7.1: Update binary SDK version for AppVeyor | ||||
| * | Update binary SDK version for AppVeyor | Anatol Belski | 2018-09-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Ferenc Kovacs | 2018-09-12 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Ferenc Kovacs | 2018-09-12 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'PHP-5.6' into PHP-7.0 | Ferenc Kovacs | 2018-09-12 | 0 | -0/+0 |
| | |\ | |||||
| | | * | 5.6.39 will be the next | Ferenc Kovacs | 2018-09-11 | 3 | -5/+7 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2018-09-11 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.1: 7.0.33 next | ||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2018-09-11 | 0 | -0/+0 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | * PHP-7.0: 7.0.33 next |