summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update NEWS for PHP 7.4.11PHP-7.4.11Derick Rethans2020-09-291-1/+1
|
* NEWS maintenanceDerick Rethans2020-09-292-5/+8
|
* Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2020-09-298-27/+92
| | | | | | | | * PHP-7.3: Update UPGRADING Update NEWS & UPGRADING Do not decode cookie names anymore Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
* Update UPGRADINGStanislav Malyshev2020-09-291-0/+5
|
* Update NEWS for 7.4.11Derick Rethans2020-09-151-0/+3
|
* Update NEWS for PHP 7.4.11RC1Derick Rethans2020-09-151-1/+1
|
* Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-141-2/+6
|\ | | | | | | | | * PHP-7.3: Avoid segfault if module/extension version is not defined
| * Avoid segfault if module/extension version is not definedChristoph M. Becker2020-09-141-2/+6
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-115-5/+29
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80067: Omitting the port in bindto setting errors
| * Fix #80067: Omitting the port in bindto setting errorsChristoph M. Becker2020-09-115-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | A recent commit[1] which fixed a memory leak introduced a regression regarding the formerly liberal handling of IP addresses to bind to. We fix this by reverting that commit, and fix the memory leak where it actually occurs. In other words, this fix is less intrusive than the former fix. [1] <http://git.php.net/?p=php-src.git;a=commit;h=0b8c83f5936581942715d14883cdebddc18bad30> Closes GH-6104.
* | Fix azure i386 build, againNikita Popov2020-09-101-0/+1
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Sammy Kaye Powers2020-09-092-0/+18
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79825: opcache.file_cache causes SIGSEGV with custom opcode handlers
| * Fix #79825: opcache.file_cache causes SIGSEGV with custom opcode handlersSammy Kaye Powers2020-09-092-0/+18
| | | | | | | | Modules may have changed after restart which can cause dangling pointers from custom opcode handlers in the second-level cache files. This fix includes the installed module names and versions in the accel_system_id hash as entropy. Closes GH-5836
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-083-2/+39
|\ \ | |/ | | | | | | * PHP-7.3: Fix #72941: Modifying bucket->data by-ref has no effect any longer
| * Fix #72941: Modifying bucket->data by-ref has no effect any longerChristoph M. Becker2020-09-083-2/+39
| | | | | | | | | | | | | | To match the PHP 5 behavior, we have to explicitly cater to `buffer` or `data` being references. Closes GH-6096.
* | Support more placeholders in bless_tests.phpNikita Popov2020-09-081-3/+10
| | | | | | | | And don't replace trailing --CLEAN-- sections.
* | Revert "Update libzip on macos"Nikita Popov2020-09-081-4/+1
| | | | | | | | This reverts commit 090bddb93488b6bcf411e970afe77d96f86f4ac8.
* | Revert "Manually build re2c on macos"Nikita Popov2020-09-081-9/+2
| | | | | | | | This reverts commit 9bbe236f6adead060d83c87a581674f4917db3de.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-09-082-3/+4
|\ \ | |/ | | | | | | * PHP-7.3: Fixed bug #80077
| * Fixed bug #80077Nikita Popov2020-09-082-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quoting from the bug report: > The domain names passed to getmxrr() do not contain a trailing dot. > DNS lookups which do not find records will (depending on the local > resolver config) try again by adding the local domain to the end of > the searched host/domain. In many environments there's an mx record > for any subdomain of the local domain and the MX query will return > a hit. But the test expects no hit. So the test fails when checking > that "qa.php.net" does not have an MX record in DNS. In our local > environment the resolver falls back to also check qa.php.net.kippdata.de > which does have an MX record. Using "qa.php.net." instead of "qa.php.net" > should fix this for everyone.
* | Don't leave behind temporary file in bug70362.phptNikita Popov2020-09-071-3/+8
| |
* | Fix azure i386 buildNikita Popov2020-09-051-1/+2
| | | | | | | | Looks like pgsql on i386 broke even more.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-09-042-2/+4
|\ \ | |/ | | | | | | * PHP-7.3: Avoid duplicate octal warning during heredoc scan ahead
| * Avoid duplicate octal warning during heredoc scan aheadNikita Popov2020-09-043-352/+353
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-09-034-0/+18
|\ \ | |/ | | | | | | * PHP-7.3: Fixed bug #80049
| * Fixed bug #80049Nikita Popov2020-09-034-0/+18
| | | | | | | | | | Type checking may convert to refcounted values, so force freeing of extra args.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-032-8/+5
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80048: Bug #69100 has not been fixed for Windows
| * Fix #80048: Bug #69100 has not been fixed for WindowsChristoph M. Becker2020-09-032-8/+7
| | | | | | | | | | | | We fix the erroneous length calculation on Windows, too. Closes GH-6067.
* | Fixed bug #80046Nikita Popov2020-09-034-5/+35
| | | | | | | | | | We already protect against optimizing away loop frees in DFA pass, but not in block pass.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-031-0/+1
|\ \ | |/ | | | | | | * PHP-7.3: Skip test if A: drive exists
| * Skip test if A: drive existsChristoph M. Becker2020-09-031-0/+1
| | | | | | | | Otherwise the test case will fail for a very different reason.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-09-031-8/+12
|\ \ | |/ | | | | | | * PHP-7.3: Handle memory limit error during string reallocation correctly
| * Handle memory limit error during string reallocation correctlyNikita Popov2020-09-031-8/+12
| | | | | | | | | | | | | | | | | | Do not decrement the refcount before allocating the new string, as the allocation operation may bail out and cause a use-after-free lateron. We can only decrement the refcount once the allocation has succeeded. Fixes oss-fuzz #25384.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-09-0212-13/+33
|\ \ | |/ | | | | | | * PHP-7.3: Fix binary-safety of parse_url
| * Fix binary-safety of parse_urlNikita Popov2020-09-0212-13/+33
| | | | | | | | | | | | | | php_parse_url() is intended to support strings that are not zero terminated. We can't use strcspn in the implementation. As we have two uses of strcspn, add a helper.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-09-022-2/+3
|\ \ | |/ | | | | | | * PHP-7.3: Fix throwing of yield from related exceptions into generator
| * Fix throwing of yield from related exceptions into generatorNikita Popov2020-09-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | Use the general zend_generator_throw_exception() helper for this. Otherwise we don't handle the off-by-one opline correctly (should we maybe just stop doing that?) This is a followup to ad750c3bb6e7b48384c6265eb9d3bcf5b4000652, which fixed a different yield from exception handling problem that happened to show up in the same test case from oss-fuzz #25321. Now both issues should be fixed.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-09-022-0/+17
|\ \ | |/ | | | | | | * PHP-7.3: Fix infinite loop on string offset during by-ref list assign
| * Fix infinite loop on string offset during by-ref list assignNikita Popov2020-09-022-0/+17
| | | | | | | | | | | | | | There is a deeper underlying issue here, in that the opcodes violate VM write-fetch safety, but let's fix the infinite loop first. This fixes oss-fuzz #25352.
* | Check for null EX(func) in write_propertyNikita Popov2020-09-012-3/+35
| | | | | | | | | | | | | | | | This can happen if zend_call_function inserted a dummy frame, and we already switched to the dummy frame in leave_helper, and an exception is thrown during CV destruction. Fixes oss-fuzz #25343.
* | Fix pi node removal when removing predecessorNikita Popov2020-09-012-1/+15
| | | | | | | | | | | | | | We can't just remove the uses, we need to replace uses. The test case only fails on master with SSA integrity violations, but I believe the root issue also existed previously.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-312-0/+16
|\ \ | |/ | | | | | | * PHP-7.3: Fix leak on assign concat of array and empty string
| * Fix leak on assign concat of array and empty stringNikita Popov2020-08-312-0/+16
| |
* | Fix leak on consteval exception in ReflectionClass::__toString()Nikita Popov2020-08-312-0/+18
| |
* | Check update constant failure in ReflectionClassConstant::__toString()Nikita Popov2020-08-312-1/+22
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Derick Rethans2020-08-311-3/+3
|\ \ | |/
| * Fixed test caseDerick Rethans2020-08-311-3/+3
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Derick Rethans2020-08-315-19414/+16670
|\ \ | |/
| * Update timelib to 2018.04Derick Rethans2020-08-315-19414/+16670
| |
* | Fix bug #80037Nikita Popov2020-08-314-44/+36
| | | | | | | | | | | | | | | | | | | | | | If we're accessing an uninitialized typed property and __get is defined, don't perform a read_property callback, as __get is supposed to have no effect on uninitialized typed properties. Usually it doesn't, but by-reference assignments cannot be performed through read_property. I'm deleting the test for bug #80039 again, as it doesn't really make sense anymore with this fix.