summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update versions for PHP 7.3.0beta3php-7.3.0beta3Christoph M. Becker2018-08-283-4/+4
|
* Merge branch 'PHP-7.2' into PHP-7.3Remi Collet2018-08-280-0/+0
|\ | | | | | | | | * PHP-7.2: bump to 7.2.11-dev
| * bump to 7.2.11-devRemi Collet2018-08-283-5/+8
| |
* | Store zlog stream in each child so it can be reusedJakub Zelenka2018-08-278-53/+92
| | | | | | | | | | | | | | This change results in using the same buffer for multiple stdio events which should fix inconsistencies of handling messages that are not ended with a new line and possibly very long messages that are split to multiple events.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-263-2/+20
|\ \ | |/ | | | | | | * PHP-7.2: Fix #68180: iconv_mime_decode can return extra characters in a header
| * Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-263-2/+20
| |\ | | | | | | | | | | | | * PHP-7.1: Fix #68180: iconv_mime_decode can return extra characters in a header
| | * Fix #68180: iconv_mime_decode can return extra characters in a headerChristoph M. Becker2018-08-263-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, the algorithm to append a converted string to an existing `smart_str` works by increasing the `smart_str` buffer, to let `iconv` convert characters until there is no more space, to set the new length of the `smart_str` and to repeat until there is no more input. Formerly, the new length calculation has been wrong, though, since we would have to take the old `out_len` into account (`buf_growth - old_out_len - out_len`). However, since there is no need to take the old `out_len` into account when increasing the `smart_str` buffer, we can simplify the fix, avoiding an additional variable.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-253-1/+28
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #60494: iconv_mime_decode does ignore special characters
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-253-1/+28
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #60494: iconv_mime_decode does ignore special characters
| | * Fix #60494: iconv_mime_decode does ignore special charactersChristoph M. Becker2018-08-253-1/+28
| | | | | | | | | | | | | | | | | | We must not ignore erroneous characters in mime headers, but rather let iconv_mime_decode() fail in this case, issuing the usual notice regarding illegal characters.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-253-0/+90
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #63839: iconv_mime_decode_headers function is skipping headers
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-253-0/+90
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #63839: iconv_mime_decode_headers function is skipping headers
| | * Fix #63839: iconv_mime_decode_headers function is skipping headersChristoph M. Becker2018-08-253-0/+90
| | | | | | | | | | | | | | | | | | | | | We have to cater to the possibility that `=?` is not the start of an encoded-word, but rather a literal `=?`. If a line break is found while we're still looking for the charset, we can safely assume that it's a literal `=?`, and act accordingly.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-253-0/+40
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #55146: iconv_mime_decode_headers() skips some headers
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-253-0/+42
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #55146: iconv_mime_decode_headers() skips some headers
| | * Fix #55146: iconv_mime_decode_headers() skips some headersChristoph M. Becker2018-08-253-0/+42
| | | | | | | | | | | | | | | | | | If we're expecting the start of an encoded word (`=?`), but instead of the question mark get a line break (CR or LF), we must not append it to the `pretval`.
* | | Fix #53891: iconv_mime_encode() fails to Q-encode UTF-8 stringChristoph M. Becker2018-08-253-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The minimum length of an encoded-word is actually the pure encoding overhead plus the length of the `output-charset` plus the minimum unit of encoded text, which is 4 for B-encoding and (for simplicity) 3 for Q-encoding. We also cater to the possibility that we need further encoded words, which would be split by the `line-break-chars` followed by a space character. Obviously, the former `out_charset_len + 12` is too simplistic and wrong in the given case (where the magic number would be 13). These simplifications are somewhat wasteful, but iconv_mime_encode() with Q-encoding is wasteful anyway (see bug 66828[1]), and the proper solution to convert the whole input to the desired output charset upfront, and applying the encoding afterwards appears too much a change for the stable releases. [1] <https://bugs.php.net/66828>
* | | Fix #76712: Assignment of empty string creates extraneous text nodeChristoph M. Becker2018-08-253-3/+29
| | | | | | | | | | | | | | | | | | We work around this peculiarity of libxml by using xmlNodeSetContent(), which does not exhibit this behavior. This also saves us from manually calculating the string length.
* | | Remove some old parts of the phpPeter Kokot2018-08-252-1/+0
| | | | | | | | | | | | | | | | | | Since ba138a3746b3077ebe5b7356b5b49f21cfc30438 the generate-phpt library has been unbundled from the php-src. This patch cleans two remaining parts.
* | | Merge branch 'PHP-7.2' into PHP-7.3Anatol Belski2018-08-231-5/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: mkdist.php: recursively check dll dependencies
| * | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-08-231-5/+5
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: mkdist.php: recursively check dll dependencies
| | * mkdist.php: recursively check dll dependenciesDylan K. Taylor2018-08-231-5/+5
| | | | | | | | | | | | Fix duplication of recursively checked deps
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-231-17/+9
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Simplify regression test
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-231-17/+9
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Simplify regression test
| | * Simplify regression testChristoph M. Becker2018-08-231-17/+9
| | | | | | | | | | | | | | | | | | | | | There's no need to actually try to trigger an out-of-memory condition to proof the leak; instead we can simply rely on the Zend MM to report the memory leaks in debug mode (at least on Linux). Therefore we simplify the regression test, which also makes it run much faster.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-223-0/+29
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #68825: Exception in DirectoryIterator::getLinkTarget()
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-223-0/+29
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #68825: Exception in DirectoryIterator::getLinkTarget()
| | * Fix #68825: Exception in DirectoryIterator::getLinkTarget()Christoph M. Becker2018-08-223-0/+29
| | | | | | | | | | | | | | | | | | intern->file_name may not have been properly set when DirectoryIterator::getLinkTarget() is called, so we make sure it is before using it.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-221-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Increase memory_limit to prevent test failures
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-221-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Increase memory_limit to prevent test failures
| | * Increase memory_limit to prevent test failuresChristoph M. Becker2018-08-221-1/+1
| | |
* | | Fix #76773 - Methods with a concrete scope need to be added againChris Wright2018-08-223-3/+39
| | |
* | | Fix #76767: ‘asm’ operand has impossible constraints in zend_operators.hOndřej Surý2018-08-222-4/+6
| | | | | | | | | | | | We disable assembly code with gcc 4.8 on i386.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-223-0/+29
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #76778: array_reduce leaks memory if callback throws exception
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-223-0/+31
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #76778: array_reduce leaks memory if callback throws exception
| | * Fix #76778: array_reduce leaks memory if callback throws exceptionChristoph M. Becker2018-08-223-0/+31
| | | | | | | | | | | | We have to release the result variable in the error case, too.
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2018-08-220-0/+0
|\ \ \ | |/ /
| * | Fixed bug #75797Massimiliano Braglia2018-08-222-2/+7
| | | | | | | | | | | | | | | Fix zend_register_class_alias_ex() to use non-persistent strings for (non-persistent) userland classes.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-08-223-2/+49
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fixed bug #76777 and added test
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-08-223-2/+49
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fixed bug #76777 and added test
| | * Fixed bug #76777 and added testVille Hukkamaki2018-08-223-2/+49
| | | | | | | | | | | | Set undefined values to null rather than undefined.
* | | Don't report mmap failure if it is expectedDavid Carlier2018-08-221-1/+1
| | | | | | | | | | | | | | | | | | When using mmap with MAP_FIXED_NOREPLACE or MAP_FIXED|MAP_EXCL an mmap failure is not an error condition, so do not print an error message in this case.
* | | Stop using zend_function->reserved[] space.Dmitry Stogov2018-08-224-5/+5
| | |
* | | Support fixed address mmap without replacementDavid Carlier2018-08-211-2/+7
| | | | | | | | | | | | | | | | | | | | | We did not use MAP_FIXED here, because it may replace an existing mapping. This commit adds support for MAP_FIXED_NOREPLACE (available on newer Linux kernels) and MAP_FIXED|MAP_EXCL (available on FreeBSD), which avoid this issue.
* | | Removed dead codeDmitry Stogov2018-08-212-5/+1
| | |
* | | Avoid directly adding to string literalDavid Carlier2018-08-211-15/+35
| | | | | | | | | | | | This fixes a Clang warning.
* | | Avoid hash lookups in BIND_STATIC and BIND_LEXICAL opcode handlers.Dmitry Stogov2018-08-2010-32/+57
| | | | | | | | | | | | Encode static variable offset into opline->extended_value.
* | | [ci skip] Correct minor typo (GC_GLAGS to GC_FLAGS)Aaron Stone2018-08-201-1/+1
| | |
* | | Make array parsing parameters error messages consistency with ZPP failureGabriel Caruso2018-08-1954-1666/+1668
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2018-08-194-2/+101
|\ \ \ | |/ /
View Lorry Controller Status