summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update versions for PHP 7.4.12RC1php-7.4.12RC1Derick Rethans2020-10-132-5/+5
|
* Update NEWS for PHP 7.4.12RC1Derick Rethans2020-10-131-1/+1
|
* Ignore memory leaks reported for some libc-client functionsChristoph M. Becker2020-10-131-0/+6
| | | | | | | | At least on Windows, some static variables are lazily initialized during `mail_open()` and `mail_lsub()`, which are reported as memory leaks. We suppress these false positives. Closes GH-6326.
* Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-130-0/+0
|\ | | | | | | | | * PHP-7.3: 7.3.25 is next
| * 7.3.25 is nextChristoph M. Becker2020-10-134-6/+9
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-123-0/+15
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80226: imap_sort() leaks sortpgm memory
| * Fix #80226: imap_sort() leaks sortpgm memoryChristoph M. Becker2020-10-123-0/+15
| | | | | | | | | | | | We need to free what we have allocated. Closes GH-6327.
* | intl: report more information about message pattern parse errorsPhilip Hofstetter2020-10-123-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message patterns can be pretty complex, so reporting a generic U_PARSE_ERROR without any additional information makes it needlessly hard to fix erroneous patterns. This commit makes use of the additional UParseError* parameter to umsg_open to retrieve more details about the parse error to report that to the user via intl_get_error_message() Additional improve error reporting from the IntlMessage constructor. Previously, all possible failures when calling IntlMessage::__construct() would be masked away with a generic "Constructor failed" message. This would include invalid patterns. This commit makes sure that the underlying error that caused the constructor failure is reported as part of the IntlException error message. Closes GH-6325.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-123-9/+37
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80216: imap_mail_compose() does not validate types/encodings
| * Fix #80216: imap_mail_compose() does not validate types/encodingsChristoph M. Becker2020-10-123-9/+37
| | | | | | | | | | | | | | We need to check whether the given `type`s and `encoding`s are within bounds to avoid segfaults and out-of-bound reads. Closes GH-6323.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-123-2/+21
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80223: imap_mail_compose() leaks envelope on malformed bodies
| * Fix #80223: imap_mail_compose() leaks envelope on malformed bodiesChristoph M. Becker2020-10-123-2/+21
| | | | | | | | | | | | We have to clean up even on failure. Closes GH-6322.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-122-1/+2
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80220: imap_mail_compose() may leak memory
| * Fix #80220: imap_mail_compose() may leak memoryChristoph M. Becker2020-10-122-1/+2
| | | | | | | | | | | | | | | | | | Unless `topbod` is of `TYPEMULTIPART`, `mail_free_body()` does not free the `nested.part`; while we could do this ourselves, instead we just ignore additional bodies in this case, i.e. we don't attach them in the first place. Closes GH-6321.
* | Revert "Add missing X509 purpose constants"Nikita Popov2020-10-122-14/+2
| | | | | | | | | | | | This reverts commit 1e53e14bc31aec98a408e517c7c8493ef4bf80cd. This fails on Travis.
* | Add missing X509 purpose constantsVincent JARDIN2020-10-122-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | X509_PURPOSE_OCSP_HELPER, X509_PURPOSE_TIMESTAMP_SIGN are available from OpenSSL for many years: - X509_PURPOSE_OCSP_HELPER, since 2001 - X509_PURPOSE_TIMESTAMP_SIGN, since 2006 Also drop the ifdef check for X509_PURPOSE_ANY, as it is always available in supported OpenSSL versions. Closes GH-6312.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-10-124-14/+44
|\ \ | |/ | | | | | | | | * PHP-7.3: Detect self-addition of array more accurately Deindirect source elements in zend_hash_merge
| * Detect self-addition of array more accuratelyNikita Popov2020-10-122-1/+11
| | | | | | | | | | | | | | While the zvals may be different, they may still point to the same array. Fixes oss-fuzz #26245.
| * Deindirect source elements in zend_hash_mergeNikita Popov2020-10-122-13/+33
| | | | | | | | | | | | | | | | If the RHS has INDIRECT elements, we do not those to be added to the LHS verbatim. As we're using UPDATE_INDIRECT, we might even create a nested INDIRECT that way. This is a side-quest of oss-fuzz #26245.
* | Backport schedule in yamlNikita Popov2020-10-121-0/+8
| | | | | | | | | | I'm not sure it's needed, but let's try it: Add the scheduled builds on PHP-7.4 and PHP-8.0 as well, rather than just master.
* | Avoid non-object in FE_FREENikita Popov2020-10-122-25/+40
| | | | | | | | | | | | Even if the properties HT is empty, make sure we still leave an object in the FE_RESET result, so our type inference results stay correct.
* | Merge branch 'PHP-7.3' into PHP-7.4Derick Rethans2020-10-111-9/+7
|\ \ | |/
| * Fixed test for bug #48097 due to confirmed data changes in timelibDerick Rethans2020-10-111-9/+7
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-103-1/+78
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80215: imap_mail_compose() may modify by-val parameters
| * Fix #80215: imap_mail_compose() may modify by-val parametersChristoph M. Becker2020-10-103-1/+78
| | | | | | | | | | | | | | | | | | We separate the input arrays and all sub-arrays to avoid modification of the passed parameters. This should be rewritten to use `zend_string`s for the "master" branch. Closes GH-6316.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-103-0/+28
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80213: imap_mail_compose() segfaults on certain $bodies
| * Fix #80213: imap_mail_compose() segfaults on certain $bodiesChristoph M. Becker2020-10-103-0/+28
| | | | | | | | | | | | | | We have to cater to non-associative arrays where the key may be `NULL`; we just skip these elements. Closes GH-6315.
* | Don't specify symfony branchNikita Popov2020-10-101-1/+1
| | | | | | | | This was renamed from master to 5.x. Just use the default branch.
* | Fixed bug #80186Nikita Popov2020-10-094-35/+127
| | | | | | | | | | Early exit in FE_RESET if get_properties() returns empty array, as we cannot add HT iterators to zend_empty_array.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-10-091-1/+1
|\ \ | |/ | | | | | | * PHP-7.3: Make iconv errno support test pass on Solaris.
| * Make iconv errno support test pass on Solaris.Petr Sumbera2020-10-091-1/+1
| | | | | | | | Closes GH-6291.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-10-091-0/+2
|\ \ | |/ | | | | | | * PHP-7.3: XFAIL test broken by timelib update
| * XFAIL test broken by timelib updateNikita Popov2020-10-091-0/+2
| | | | | | | | | | I was expecting this to get fixed quickly, but it didn't. XFAIL for now.
* | Updated to version 2020.2 (2020b)Derick Rethans2020-10-081-853/+724
| |
* | Empty mergeDerick Rethans2020-10-080-0/+0
|\ \ | |/
| * Updated to version 2020.2 (2020b)Derick Rethans2020-10-081-853/+724
| |
* | Updated to version 2020.2 (2020b)Derick Rethans2020-10-081-1/+1
| |
* | Empty mergeDerick Rethans2020-10-080-0/+0
|\ \ | |/
| * Updated to version 2020.2 (2020b)Derick Rethans2020-10-081-1/+1
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-081-1/+1
|\ \ | |/ | | | | | | * PHP-7.3: Fix too strict imap test expectations
| * Fix too strict imap test expectationsChristoph M. Becker2020-10-082-2/+2
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-073-4/+37
|\ \ | |/ | | | | | | * PHP-7.3: Fix #77040: tidyNode::isHtml() is completely broken
| * Fix #77040: tidyNode::isHtml() is completely brokenChristoph M. Becker2020-10-073-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of `tidyNode::isHtml()` states that this method "checks if a node is part of a HTML document". That is, of course, nonsense, since a tidyNode is "an HTML node in an HTML file, as detected by tidy." What this method is actually supposed to do is to check whether a node is an element (unless it is the root element). This has been broken by commit d8eeb8e[1], which assumed that `enum TidyNodeType` would represent flags of a bitmask, what it does not. [1] <http://git.php.net/?p=php-src.git;a=commit;h=d8eeb8e28673236bca3f066ded75037a5bdf6378> Closes GH-6290.
* | Fixed bug #80194Nikita Popov2020-10-073-1/+25
| | | | | | | | | | We should strip NOPs from unreachable_free blocks as well, to make sure that the free really is the first op.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-074-2/+41
|\ \ | |/ | | | | | | * PHP-7.3: Fix #80185: jdtounix() fails after 2037
| * Fix #80185: jdtounix() fails after 2037Christoph M. Becker2020-10-074-2/+41
| | | | | | | | | | | | | | | | There is no such thing as the "end of the unix epoch", and if it was, it would certainly not be 2037-10-11T02:00:00. There is, however, potential integer overflow which we need to avoid. Closes GH-6288.
* | Fix bug #80126Nikita Popov2020-10-064-12/+61
| | | | | | | | | | | | When performing an unlinked instanceof, we also need to consider interfaces of parent classes, as they may not have been inherited yet.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-053-0/+29
|\ \ | |/ | | | | | | * PHP-7.3: Fix #46050: odbc_next_result corrupts prepared resource
| * Fix #46050: odbc_next_result corrupts prepared resourceChristoph M. Becker2020-10-053-0/+29
| | | | | | | | When resetting the result's values, we also have to reset its numcols.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-10-054-34/+49
|\ \ | |/ | | | | | | * PHP-7.3: Fix -Wimplicit-function-declaration in configure