summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prepare PHP 7.3.9php-7.3.9PHP-7.3.9Christoph M. Becker2019-08-274-14/+10
|
* Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()Stanislav Malyshev2019-08-272-3/+6
| | | | | | Backport from https://github.com/kkos/oniguruma/commit/0f7f61ed1b7b697e283e37bd2d731d0bd57adb55 (cherry picked from commit 1258303e66d8dede4f02347334b9f6576e98a21b)
* Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-08-271-0/+10
| | | | | | | * PHP-7.2: Fix #75457: heap-use-after-free in php7.0.25 (cherry picked from commit 5d25ebb0dd30cdf4e8c7e83d1f0788e8fdb1c4ef)
* Fixed bug #78412Nikita Popov2019-08-152-2/+8
| | | | | | | $this should only be included in the generator GC buffer, if it will be released on destruction. (cherry picked from commit fcabe7e5e44067319f9c4123d71a7cea6a823af4)
* Update credits_ext.hChristoph M. Becker2019-08-151-1/+1
|
* Prepare 7.3.9RC1php-7.3.9RC1Christoph M. Becker2019-08-134-5/+5
|
* Bump version numbersChristoph M. Becker2019-08-133-5/+5
| | | | This should have been done four weeks ago already.
* Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-133-1/+23
|\
| * Fixed bug #77191Nikita Popov2019-08-133-1/+23
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-131-1/+2
|\ \ | |/
| * Don't destroy properties array with unset GC typeNikita Popov2019-08-131-1/+2
| | | | | | | | | | As the properties array can also be a GC root, it might have already been destroyed.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-121-0/+1
|\ \ | |/
| * Intern alias old_name earlyNikita Popov2019-08-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is likely going to end up interned lateron at some point when the new_name is referenced somewhere. However, it may be that there are some uses that do not get interned before that. In this case we will intern a string that already have zval users, without updating the refcounted flag on those zvals. In particular this can happen with something like [Foo::class], where Foo is an imported symbol. The string it resolves to won't get interned right away, but may be interned later. use Foo as Bar; $x = [Bar::class]; var_dump(Bar::X); debug_zval_dump($x); // Will show negative refcount class Foo { const X = 1; } However, this doesn't really fix the root cause, there are probably other situations where something similar can occur.
* | Updated to version 2019.2 (2019b)Derick Rethans2019-08-111-8095/+7609
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-08-092-12/+49
|\ \ | |/ | | | | | | * PHP-7.2: Fixed handling of references in nested data of objects with destructor
| * Fixed handling of references in nested data of objects with destructorDmitry Stogov2019-08-092-12/+49
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-08-092-4/+35
|\ \ | |/ | | | | | | * PHP-7.2: Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)
| * Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)Dmitry Stogov2019-08-092-4/+35
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-08-091-0/+5
|\ \ | |/ | | | | | | * PHP-7.2: Added asserts to catch GC errors when refcount goes below zero.
| * Added asserts to catch GC errors when refcount goes below zero.Dmitry Stogov2019-08-091-0/+5
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Matteo Beccati2019-08-091-1/+2
|\ \ | |/ | | | | | | * PHP-7.2: Skip test when SIGKILL is not defined
| * Skip test when SIGKILL is not definedMatteo Beccati2019-08-091-1/+2
| |
* | Fix GC tracingNikita Popov2019-08-081-15/+19
| | | | | | | | | | Due to the GC changes in 7.3 we stopped tracing most of the interesting coloring changes...
* | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-08-083-0/+38
|\ \ | |/ | | | | | | * PHP-7.2: Fixed bug #78379 (Cast to object confuses GC, causes crash)
| * Fixed bug #78379 (Cast to object confuses GC, causes crash)Dmitry Stogov2019-08-083-0/+38
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-08-062-1/+2
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78282: atime and mtime mismatch
| * Fix #78282: atime and mtime mismatchChristoph M. Becker2019-08-062-1/+2
| | | | | | | | | | | | | | | | The fix for bug #78241 assumed that `time_t` would always be 64bit, but actually is 32bit for x86. We therefore enforce 64bit arithmetic to avoid wrapping. (cherry picked from commit bf242d58e77d50d4d8fdaaaca7ede686ec4467c0)
* | Fix #78346: strip_tags no longer handling nested php tagsChristoph M. Becker2019-08-023-2/+11
| | | | | | | | | | | | When the strip tags state machine has been flattened, an if statement has mistakenly been treated as else if. We fix this, and also simplify a bit right away.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-08-022-0/+9
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78179: MariaDB server version incorrectly detected
| * Fix #78179: MariaDB server version incorrectly detectedChristoph M. Becker2019-08-022-0/+11
| | | | | | | | | | | | | | | | As of MariaDB 10.0.2, the server reports a fake version number as work- around for replication issues[1]. We apply the same "fix" as in the MariaDB client to cater to this. [1] <https://github.com/MariaDB/server/commit/c50ee6c23dbeb090963580754bec2f0a96ac0557#diff-5b45fa673c88c06a9651c7906364f592>
* | Add test for bug #78363Nikita Popov2019-08-022-0/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-021-1/+1
|\ \ | |/
| * Fixed bug #78363Nikita Popov2019-08-022-1/+4
| |
* | Remove upgrade-pcre.php scriptChristoph M. Becker2019-08-011-137/+0
| | | | | | | | | | This script has not been updated for PCRE2, and it's mostly useless anyway. Therefore we remove it altogether.
* | Fix 78213: Empty row pocketChristoph M. Becker2019-07-312-1/+4
| | | | | | | | | | We have to ensure that we don't create an arena which is smaller than its header, regardless of the configured alignment.
* | Add security related NEWS entries [ci skip]Christoph M. Becker2019-07-301-0/+10
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Remi Collet2019-07-300-0/+0
|\ \ | |/ | | | | | | * PHP-7.2: add security NEW entries + reorder [ci skip]
| * add security NEW entries + reorder [ci skip]Remi Collet2019-07-301-14/+23
| |
* | Fix #78338: Array cross-border reading in PCREChristoph M. Becker2019-07-292-1/+11
| | | | | | | | We backport r1092 from pcre2.
* | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-07-297-5/+32
|\ \ | |/ | | | | | | | | | | | | * PHP-7.2: Fix #77919: Potential UAF in Phar RSHUTDOWN Update NEWS Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment) Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
| * Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2019-07-297-5/+32
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-7.1: Fix #77919: Potential UAF in Phar RSHUTDOWN Update NEWS Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment) Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
| | * Fix #77919: Potential UAF in Phar RSHUTDOWNChristoph M. Becker2019-07-293-2/+10
| | | | | | | | | | | | | | | | | | | | | We have to properly clean up in case phar_flush() is failing. We also make the expectation of the respective test case less liberal to avoid missing such bugs in the future.
| | * Update NEWSStanislav Malyshev2019-07-291-0/+6
| | |
| | * Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)Stanislav Malyshev2019-07-293-3/+14
| | |
| | * Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)Stanislav Malyshev2019-07-293-1/+12
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-07-294-1/+36
|\ \ \ | |/ /
| * | Fix bug #78326Albert Casademont2019-07-294-1/+36
| | | | | | | | | | | | | | | Similar to what fread() does, truncate the stream_get_contents() result if the original buffer was way too large.
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-07-293-6/+31
|\ \ \ | |/ /
| * | Fix Zend signals unblockingNikita Popov2019-07-293-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few parts here: * opcache should not be blocking signals while invoking compile_file, otherwise signals may remain blocked on a compile error. While at it, also protect SHM memory during compile_file. * We should deactivate Zend signals at the end of the request, to make sure that we gracefully recover from a missing unblock and signals don't remain blocked forever. * We don't use a critical section in deactivation, because it should not be necessary. Additionally we want to clean up the signal queue, if it is non-empty. * Enable SIGG(check) in debug builds so we notice issues in the future.
* | | Update NEWS [ci skip]Christoph M. Becker2019-07-291-3/+1
| | | | | | | | | | | | | | | The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed already there.