summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* NEWS 7.2.11PHP-7.2.11Sara Golemon2018-10-091-1/+1
|
* Update NEWS for PHP 7.2.11RC1Sara Golemon2018-09-251-1/+1
|
* Merge branch 'PHP-7.1' into PHP-7.2Sara Golemon2018-09-251-1/+1
|\ | | | | | | | | * PHP-7.1: Fixed bug #76918 Repeated parameter name in arg info
| * Fixed bug #76918 Repeated parameter name in arg infoSara Golemon2018-09-251-1/+1
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-241-2/+2
|\ \ | |/
| * Terminate smart string correctlyChristopher Jones2018-09-241-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.2Christopher Jones2018-09-245-2/+125
|\ \ | |/
| * Make usable for PECL OCI8 release for PHP 7.xChristopher Jones2018-09-245-2/+125
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-241-1/+1
|\ \ | |/
| * Backport master branch comment typo fixChristopher Jones2018-09-241-1/+1
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-245-7/+7
|\ \ | |/
| * Make tests portable across PHP 7.x versionsChristopher Jones2018-09-245-7/+7
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-241-1/+0
|\ \ | |/
| * Remove $id from phpinfo as already done in PHP-7.3Christopher Jones2018-09-241-1/+0
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-24151-462/+462
|\ \ | |/
| * And strip trailing tabs too...Christopher Jones2018-09-24151-462/+462
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-2491-98/+95
|\ \ | |/
| * Sync EXPECT usage with PHP-7.3Christopher Jones2018-09-2491-98/+95
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-24267-624/+623
|\ \ | |/
| * Remove trailing whitespace to help keep branches in syncChristopher Jones2018-09-24267-624/+623
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christopher Jones2018-09-248-44/+44
|\ \ | |/
| * Remove trailing whitespace to help keep branches in sycnChristopher Jones2018-09-248-44/+44
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-09-223-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 beChristoph M. Becker2018-09-223-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.2Nikita Popov2018-09-192-12/+12
|\ \ | |/
| * Fix getColumnMeta() testNikita Popov2018-09-191-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.phptNikita Popov2018-09-191-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.2Nikita Popov2018-09-193-7/+24
|\ \ | |/
| * Fixed bug #76901Nikita Popov2018-09-193-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.2Nikita Popov2018-09-182-3/+3
|\ \ | |/
| * Fix bug #75533: array_reduce is slow when $carry is large arrayManabu Matsui2018-09-182-3/+3
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-181-0/+5
|\ \ | |/ | | | | | | * PHP-7.1: Add spectre switch for suitable vc14 versions
| * Add spectre switch for suitable vc14 versionsAnatol Belski2018-09-181-0/+5
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Pierrick Charron2018-09-172-1/+21
|\ \ | |/
| * Fix 76480: Use curl_multi_wait() so that timeouts are respectedPierrick Charron2018-09-172-1/+21
| |
* | Fix #76886: Can't build xmlrpc with expatThomas Petazzoni2018-09-152-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 Stogov2018-09-143-3/+22
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-131-0/+2
|\ \ | |/ | | | | | | * PHP-7.1: Sync version for vc++ 15.9
| * Sync version for vc++ 15.9Anatol Belski2018-09-131-0/+2
| |
* | Backport changes for OpenSSL 1.1.1 CI integrationAnatol Belski2018-09-132-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.2Anatol Belski2018-09-121-2/+2
|\ \ | |/ | | | | | | * PHP-7.1: Improve error code matching
| * Improve error code matchingAnatol Belski2018-09-121-2/+2
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-121-1/+1
|\ \ | |/ | | | | | | * PHP-7.1: Update binary SDK version for AppVeyor
| * Update binary SDK version for AppVeyorAnatol Belski2018-09-121-1/+1
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Ferenc Kovacs2018-09-120-0/+0
|\ \ | |/
| * Merge branch 'PHP-7.0' into PHP-7.1Ferenc Kovacs2018-09-120-0/+0
| |\
| | * Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2018-09-120-0/+0
| | |\
| | | * 5.6.39 will be the nextFerenc Kovacs2018-09-113-5/+7
| | | |
* | | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-110-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: 7.0.33 next
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2018-09-110-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.0: 7.0.33 next