summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | 7.0.33 nextAnatol Belski2018-09-113-5/+9
| | | |
* | | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-100-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: Sync NEWS [ci skip]
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2018-09-100-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.0: Sync NEWS [ci skip]
| | * | Sync NEWS [ci skip]Anatol Belski2018-09-101-1/+2
| | | |
* | | | add NEWS for 76582Remi Collet2018-09-101-0/+3
| | | |
* | | | Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2018-09-091-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-7.1: Update NEWS Fix for bug #76582
| * | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2018-09-091-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-7.0: Update NEWS Fix for bug #76582
| | * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2018-09-091-0/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS Fix for bug #76582
| | | * Update NEWSStanislav Malyshev2018-09-091-0/+3
| | | |
| | | * Fix for bug #76582Stanislav Malyshev2018-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | The brigade seems to end up in a messed up state if something fails in shutdown, so we clean it up.
* | | | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-09-091-2/+6
|\ \ \ \ | |/ / /
| * | | Fix ssl stream reneg limit test to print only after first renegotiationJakub Zelenka2018-09-091-2/+6
| | | | | | | | | | | | | | | | | | | | It has been reported that in some setup the test does multiple renegotiations which is allowed.
* | | | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-09-083-10/+64
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
| * | | Fix #75273: php_zlib_inflate_filter() may not update bytes_consumedChristoph M. Becker2018-09-083-10/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we return with `PSFS_PASS_ON`, we need to update `bytes_consumed` to not mislead the caller. Instead of fixing the respective `if` clauses, we eschew the early bail-outs to simplify the code a bit.
* | | | Fixed bug #76796Nikita Popov2018-09-073-1/+20
| | | |
* | | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-051-1/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: Sync with recent changes to default libcurl build
| * | | Sync with recent changes to default libcurl buildAnatol Belski2018-09-051-1/+16
| | | | | | | | | | | | | | | | (cherry picked from commit a1ba3007a452fb2618526ed7159236362219a208)
* | | | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-09-054-2/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: Fix #74454: Wrong exception being thrown when using ReflectionMethod
| * | | Fix #74454: Wrong exception being thrown when using ReflectionMethodChristoph M. Becker2018-09-054-2/+31
| | | | | | | | | | | | | | | | | | | | If zend_throw_exception_ex() already threw an exception, we should not throw again.
* | | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2018-09-043-0/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: Fix bug #74764 and add a test case
| * | | Fix bug #74764 and add a test caseVille Hukkamaki2018-09-043-0/+29
| | | |
* | | | [ci skip] Update NEWSAnatol Belski2018-09-041-0/+4
| | | |
* | | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-040-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: [ci skip] Update NEWS
| * | | [ci skip] Update NEWSAnatol Belski2018-09-041-0/+4
| | | |
* | | | Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt ↵Anatol Belski2018-09-042-75/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | from 7.3 It would probably be better to remove this test as it's too much maintanance for a little gain.
* | | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-09-047-425/+29
|\ \ \ \ | |/ / /
| * | | Revert all MySQL auth related changesNikita Popov2018-09-047-425/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per bug #76651 these changes do not appear to work correctly in some cases. As no immediate fix seems to be forthcoming, I'm reverting these changes. Revert "Fixed invalid free introduced by d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)" This reverts commit 11507c0e1bfa17a96480f3648397f6975c31551e. Revert "Fix mysqlnd build without openssl" This reverts commit 6c9db02ff7812c298d1e7e292ba731d9d3a66790. Revert "Fix VC compilation as variable size array is not supported" This reverts commit f96df64cb2219fda42ca875483f874cf3052647c. Revert "Fix MySQL 8 auth" This reverts commit d6e81f0bfd0cb90586dd83d4fd47a4302605261a.
* | | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-09-043-2/+5
|\ \ \ \ | |/ / /
| * | | Fix parenthesis warningNikita Popov2018-09-041-1/+1
| | | |
| * | | Fix bug #75481: makedev warningPeter Kokot2018-09-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To use makedev the sys/sysmacros.h needs to be included on newer systems. Cherry-picked from PHP-7.3.
* | | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-09-044-19/+66
|\ \ \ \ | |/ / /
| * | | Fixed bug #73457Ville Hukkamaki2018-09-044-18/+65
| | | | | | | | | | | | | | | | Correctly report errors when opening FTP data connection.
* | | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-031-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.1: Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
View Lorry Controller Status