Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prepare PHP 7.3.12php-7.3.12PHP-7.3.12 | Christoph M. Becker | 2019-11-19 | 4 | -5/+5 |
| | |||||
* | Prepare 7.3.12RC1php-7.3.12RC1 | Christoph M. Becker | 2019-11-05 | 4 | -5/+5 |
| | |||||
* | Merge branch 'PHP-7.2' into PHP-7.3 | Sara Golemon | 2019-11-05 | 0 | -0/+0 |
|\ | | | | | | | | | * PHP-7.2: Bump for 7.2.26-dev | ||||
| * | Bump for 7.2.26-dev | Sara Golemon | 2019-11-05 | 3 | -5/+8 |
| | | |||||
* | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-11-05 | 3 | -0/+40 |
|\ \ | |/ | | | | | | | * PHP-7.2: Fixed bug #78775 | ||||
| * | Fixed bug #78775 | Nikita Popov | 2019-11-05 | 3 | -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.patch | Christoph M. Becker | 2019-11-05 | 1 | -28/+0 |
| | | | | | | | | | | The proper `SIZEOF_SIZE_T` definitions are available as of Oniguruma 6.9.1; no more need to patch. | ||||
* | | Merge branch 'PHP-7.2' into PHP-7.3 | Christoph M. Becker | 2019-10-31 | 2 | -4/+4 |
|\ \ | |/ | | | | | | | * PHP-7.2: Fix test cases for libxml2 2.9.10 | ||||
| * | Fix test cases for libxml2 2.9.10 | Christoph M. Becker | 2019-10-31 | 2 | -4/+4 |
| | | | | | | | | | | Since the error reporting has been slightly changed, we have to adapt the two affected test cases. | ||||
* | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-10-30 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | * PHP-7.2: Add missing refcount increment | ||||
| * | Add missing refcount increment | Nikita Popov | 2019-10-30 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-10-29 | 3 | -1/+23 |
|\ \ | |/ | | | | | | | * PHP-7.2: Fixed bug #78689 | ||||
| * | Fixed bug #78689 | Nikita Popov | 2019-10-29 | 3 | -1/+23 |
| | | |||||
* | | Merge branch 'PHP-7.2' into PHP-7.3 | Stanislav Malyshev | 2019-10-28 | 2 | -4/+4 |
|\ \ | |/ | | | | | | | | | | | * PHP-7.2: Fix libmagic buffer overflow issue (CVE-2019-18218) bump version set versions for release | ||||
| * | Merge branch 'PHP-7.1' into PHP-7.2 | Stanislav Malyshev | 2019-10-28 | 2 | -4/+4 |
| |\ | | | | | | | | | | | | | | | | | | | * PHP-7.1: Fix libmagic buffer overflow issue (CVE-2019-18218) bump version set versions for release | ||||
| | * | Fix libmagic buffer overflow issue (CVE-2019-18218) | Stanislav Malyshev | 2019-10-27 | 2 | -4/+4 |
| | | | | | | | | | | | | Ported from https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84 | ||||
| | * | bump version | Joe Watkins | 2019-10-22 | 3 | -6/+10 |
| | | | |||||
| | * | set versions for releasephp-7.1.33 | Joe Watkins | 2019-10-22 | 3 | -3/+3 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Christoph M. Becker | 2019-10-28 | 3 | -6/+23 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix #78751: Serialising DatePeriod converts DateTimeImmutable | ||||
| * | | Fix #78751: Serialising DatePeriod converts DateTimeImmutable | Christoph M. Becker | 2019-10-28 | 3 | -6/+23 |
| | | | | | | | | | | | | | | | | | | When getting the properties of a DatePeriod instance we have to retain the proper classes, and when restoring a DatePeriod instance we have to cater to DateTimeImmutable instances as well. | ||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-10-28 | 3 | -8/+38 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix bug #78752 | ||||
| * | | Fix bug #78752 | Nikita Popov | 2019-10-28 | 3 | -8/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | NULL out the execute_data before destroying it, otherwise GC may trigger while the execute_data is partially destroyed, resulting in double-frees. The handling of call stack unfreezing is a bit awkward because it's a ZEND_API function, so we can't change the signature. | ||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-10-25 | 4 | -14/+42 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fixed bug #78747 | ||||
| * | | Fixed bug #78747 | Nikita Popov | 2019-10-25 | 4 | -13/+42 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-10-23 | 1 | -1/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Use ICU's CXXFLAGS when using pkg-config | ||||
| * | | Use ICU's CXXFLAGS when using pkg-config | Ryan Schmidt | 2019-10-23 | 1 | -1/+2 |
| | | | | | | | | | | | | This mirrors how ICU's CXXFLAGS are already used when using icu-config. | ||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-10-23 | 1 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well | ||||
| * | | Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well | Nikita Popov | 2019-10-23 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | This is a backport of c518932c0326a938f0fd0254f2adb03b1cddfbca from the PHP 7.4 branch. | ||||
* | | | Update NEWS | Christoph M. Becker | 2019-10-22 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Remi Collet | 2019-10-22 | 0 | -0/+0 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: add NEWS entry | ||||
| * | | add NEWS entry | Remi Collet | 2019-10-22 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Stanislav Malyshev | 2019-10-21 | 3 | -4/+72 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * PHP-7.2: Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) bump versions after release set versions for release | ||||
| * | | Merge branch 'PHP-7.1' into PHP-7.2 | Stanislav Malyshev | 2019-10-21 | 3 | -4/+72 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | * PHP-7.1: Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) bump versions after release set versions for release | ||||
| | * | Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) | Jakub Zelenka | 2019-10-20 | 4 | -5/+75 |
| | | | |||||
| | * | bump versions after release | Joe Watkins | 2019-08-28 | 3 | -6/+10 |
| | | | |||||
| | * | set versions for releasephp-7.1.32 | Joe Watkins | 2019-08-28 | 3 | -4/+12 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Joe Watkins | 2019-10-21 | 4 | -31/+49 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix bug #78697: inaccurate error message | ||||
| * | | Fix bug #78697: inaccurate error message | Fabien Villepinte | 2019-10-21 | 4 | -31/+49 |
| | | | |||||
* | | | Fix #78633: Heap buffer overflow (read) in mb_eregi | Christoph M. Becker | 2019-10-20 | 3 | -1/+15 |
| | | | | | | | | | | | | We backport kkos/oniguruma@15c4228aa2ffa02140a99912dd3177df0b1841c6. | ||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Christoph M. Becker | 2019-10-19 | 3 | -0/+27 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix #78694: Appending to a variant array causes segfault | ||||
| * | | Fix #78694: Appending to a variant array causes segfault | Christoph M. Becker | 2019-10-19 | 3 | -0/+27 |
| | | | | | | | | | | | | | | | | | | `write_dimension` object handlers have to be able to handle `NULL` `offset`s; for now we simply throw an exception instead of following the `NULL` pointer. | ||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Christoph M. Becker | 2019-10-18 | 6 | -4/+35 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix #70153 \DateInterval incorrectly unserialized | ||||
| * | | Fix #70153 \DateInterval incorrectly unserialized | m.yakunin | 2019-10-18 | 6 | -4/+35 |
| | | | | | | | | | | | | | | | Added a separate macro for reading 'days' property, so that bool(false) is correctly converted to the proper internal representation. | ||||
* | | | Import timelib version 2018.03 | Derick Rethans | 2019-10-15 | 4 | -1101/+1091 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Joe Watkins | 2019-10-14 | 4 | -11/+18 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix checksum calculation for opcache | ||||
| * | | Fix checksum calculation for opcache | Mitch Hagstrand | 2019-10-14 | 4 | -11/+18 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Christoph M. Becker | 2019-10-12 | 2 | -0/+9 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix #78665: Multicasting may leak memory | ||||
| * | | Fix #78665: Multicasting may leak memory | Christoph M. Becker | 2019-10-12 | 2 | -0/+9 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-10-10 | 2 | -7/+8 |
|\ \ \ | |/ / | |||||
| * | | Fix leak in phar open | Nikita Popov | 2019-10-10 | 2 | -7/+8 |
| | | |