summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update NEWSphp-7.3.13PHP-7.3.13Christoph M. Becker2019-12-171-0/+16
|
* Fix testStanislav Malyshev2019-12-171-1/+0
| | | | (cherry picked from commit a62154564d7caffc80b5917ce1962cea4f3d184a)
* Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-12-173-3/+16
| | | | | | | | * PHP-7.2: Fix test Fix bug #78793 (cherry picked from commit 5cb4686753a853cb07844feb2b082b409fd7e880)
* Fix build - no model field anymoreStanislav Malyshev2019-12-171-2/+0
| | | | (cherry picked from commit b74a300edf9ee1cd33edbafd9f3aec37ff4bf004)
* Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-12-179-7/+88
| | | | | | | | | | | * PHP-7.2: Fixed bug #78910 Fix #78878: Buffer underflow in bc_shift_addsub Fix test Fix #78862: link() silently truncates after a null byte on Windows Fix #78863: DirectoryIterator class silently truncates after a null byte (cherry picked from commit a65b8abf2c9702503591d894ddac0b2f046950b6)
* Fix #78943: mail() may release string with refcount==1 twiceChristoph M. Becker2019-12-171-3/+0
| | | | | | | | | | | Since we need `headers_lc` as well as `headers_trim` in the following, we do not release the former even if they are the same string, to avoid complicating the release logic even more. A new test case is not necessary, since we already have mail_basic_alt2-win32.phpt and others. (cherry picked from commit 518a160b65fe1c535dc7e78972ba7428c2a4e197)
* Update for 7.3.13Christoph M. Becker2019-12-174-5/+5
|
* Prepare 7.3.13RC1php-7.3.13RC1Christoph M. Becker2019-12-034-10/+8
|
* Next is 7.3.14Christoph M. Becker2019-12-034-6/+8
|
* Merge branch 'PHP-7.2' into PHP-7.3Remi Collet2019-12-030-0/+0
|\ | | | | | | | | * PHP-7.2: next is 7.2.27
| * next is 7.2.27Remi Collet2019-12-033-5/+8
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-12-023-1/+11
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78814: strip_tags allows / in tag name => whitelist bypass
| * Fix #78814: strip_tags allows / in tag name => whitelist bypassChristoph M. Becker2019-12-023-1/+11
| | | | | | | | | | | | | | When normalizing tags to check whether they are contained in the set of allowable tags, we must not strip slashes, unless they come immediately after the opening `<`, or immediately before the closing `>`.
* | Fix #78296: is_file fails to detect fileChristoph M. Becker2019-12-024-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | If we're constructing extended-length paths (i.e. paths prefixed with `\\?\`), we have to replace all forward slashes with backward slashes, because the former are not supported by Windows for extended-length paths. The more efficient and likely cleaner alternative solution would be to cater to this in `php_win32_ioutil_normalize_path_w()` by always replacing forward slashes, but that might break existing code. It might be sensible to change that for `master`, though.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-12-023-1/+15
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78833: Integer overflow in pack causes out-of-bound access
| * Fix #78833: Integer overflow in pack causes out-of-bound accessChristoph M. Becker2019-12-023-1/+15
| | | | | | | | | | We check for potential signed integer overflow, and bail out gracefully, in that case.
* | Upgrade to Oniguruma 6.9.4Christoph M. Becker2019-11-3074-2923/+3691
| | | | | | | | Oniguruma 6.9.4 fixes several CVEs.
* | Add missing skip checksChristoph M. Becker2019-11-291-1/+5
| |
* | Partially revert "Adapt test cases for Oniguruma 6.9.4"Christoph M. Becker2019-11-292-33/+0
| | | | | | | | | | | | | | This partially reverts commit c55d09c2f547634b577aa5aeaa1438d772bc29d1, because `MB_ONIGURUMA_VERSION` is only available as of PHP 7.4.0, so that change made no sense for PHP-7.3; we keep it for PHP-7.4, though. We also stick with the modification to bug78633.phpt.
* | Adapt test cases for Oniguruma 6.9.4Christoph M. Becker2019-11-293-2/+40
| | | | | | | | | | | | Apparently, bug 78633 has now really been fixed; the former fix only catered to the buffer overflow, but yielded a wrong result. Also, the order of the named captures has been fixed.
* | Fix #78840: imploding $GLOBALS crashesChristoph M. Becker2019-11-273-2/+13
| | | | | | | | We add support for IS_INDIRECT zvals to implode().
* | Fix #77638: var_export'ing certain class instances segfaultsChristoph M. Becker2019-11-253-2/+16
| | | | | | | | | | | | If objects return immutable property hash tables (typically, `zend_empty_array`), we must not try to apply recursion protection on those.
* | Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)Dmitry Stogov2019-11-253-0/+41
| |
* | Fix #78853: preg_match() may return integer > 1Christoph M. Becker2019-11-223-1/+16
| | | | | | | | | | | | | | Commit 54ebebd[1] optimized the match loop, but for this case it has been overlooked, that we must only loop if we're doing global matching. [1] <http://git.php.net/?p=php-src.git;a=commit;h=54ebebd686255c5f124af718c966edb392782d4a>
* | Merge branch 'PHP-7.2' into PHP-7.3George Wang2019-11-211-14/+26
|\ \ | |/
| * Added environment LSAPI_CLEAN_SHUTDOWN to control clean shutdown. Update ↵George Wang2019-11-211-14/+26
| | | | | | | | SAPI version to LiteSpeed v7.6 .
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-11-212-1/+4
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
| * Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOWChristoph M. Becker2019-11-212-1/+4
| | | | | | | | | | | | Apparently, this has not been tested for a long time, and might be a refactoring relict. Anyhow, we have to pass the context to `GIFNextPixel` as well.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-11-181-0/+2
|\ \ | |/ | | | | | | * PHP-7.2: Update NEWS
| * Update NEWSChristoph M. Becker2019-11-181-0/+4
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-11-183-8/+58
|\ \ | |/ | | | | | | * PHP-7.2: Fix $x = (bool)$x; for undefined with opcache
| * Fix $x = (bool)$x; for undefined with opcacheTyson Andre2019-11-183-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And `$x = !$x` Noticed while working on GH-4912 The included test would not emit undefined variable errors in php 8.0 with opcache enabled. The command used: ``` php -d zend_extension=opcache.so --no-php-ini -d error_reporting=E_ALL \ -d opcache.file_cache= -d opcache.enable_cli=1 test.php ```
* | Fix ASLR related invalid opline handler issuesChristoph M. Becker2019-11-152-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Opcache stores `opline->handler`s in shared memory. These pointers are invalid, if the main PHP DLL is loaded at another base address due to ASLR. We therefore store the address of `execute_ex` in the mmap base file, and check on startup whether it matches its current address. If not, we fall back on the file cache if enabled, and bail out otherwise. This still does not address cases where the opline handler is located inside of another DLL (e.g. for some profilers, debuggers), but there seems to be no general solution for now. (cherry picked from commit 8ba10b8fbc020dc225d3b19d8f088f1351a3e304)
* | Fixed wrong constant usageDmitry Stogov2019-11-121-1/+1
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-11-112-2/+15
|\ \ | |/ | | | | | | * PHP-7.2: Fix bug #78804 - Segmentation fault in Locale::filterMatches
| * Fix bug #78804 - Segmentation fault in Locale::filterMatchesStanislav Malyshev2019-11-113-4/+20
| |
* | Wrap php_random.h in C++ portability macrosLevi Morrison2019-11-082-2/+4
| | | | | | | | | | Also remove portability headers. This goes against the existing conventions of these files.
* | Wrap hrtime in `extern "c" {}`Levi Morrison2019-11-071-0/+6
| | | | | | | | | | | | This allows it to be used by C++ extensions without them having to do their own forward declares. Closes GH-4890.
* | Fix php_pcre_mutex_free()Nikita Popov2019-11-071-2/+4
| | | | | | | | | | | | We should only set the mutex to NULL if we actually freed it. Due to missing braces non-main threads may currently set it to NULL first.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-11-071-3/+3
|\ \ | |/ | | | | | | * PHP-7.2: Remove outdated comments in test
| * Remove outdated comments in testNikita Popov2019-11-071-3/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-11-073-4/+22
|\ \ | |/ | | | | | | * PHP-7.2: Fixed bug #78759
| * Fixed bug #78759Nikita Popov2019-11-073-4/+21
| | | | | | | | Handle INDIRECT values in array.
* | Fixed bug #78787Nikita Popov2019-11-063-4/+34
| | | | | | | | | | Not the first time inheritance of shadow properties causes an issue, thankfully this whole concept is gone in PHP 7.4.
* | 7.3.13 is nextChristoph M. Becker2019-11-054-6/+8
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Sara Golemon2019-11-050-0/+0
|\ \ | |/ | | | | | | * PHP-7.2: Bump for 7.2.26-dev
| * Bump for 7.2.26-devSara Golemon2019-11-053-5/+8
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-11-053-0/+40
|\ \ | |/ | | | | | | * PHP-7.2: Fixed bug #78775
| * Fixed bug #78775Nikita Popov2019-11-053-0/+40
| | | | | | | | | | | | Clear the OpenSSL error queue before performing SSL stream operations. As we don't control all code that could possibly be using OpenSSL, we can't rely on the error queue being empty.
* | Remove obsolete oniguruma.patchChristoph M. Becker2019-11-051-28/+0
| | | | | | | | | | The proper `SIZEOF_SIZE_T` definitions are available as of Oniguruma 6.9.1; no more need to patch.