summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prepare PHP 7.3.12php-7.3.12PHP-7.3.12Christoph M. Becker2019-11-194-5/+5
|
* Prepare 7.3.12RC1php-7.3.12RC1Christoph M. Becker2019-11-054-5/+5
|
* 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.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-312-4/+4
|\ \ | |/ | | | | | | * PHP-7.2: Fix test cases for libxml2 2.9.10
| * Fix test cases for libxml2 2.9.10Christoph M. Becker2019-10-312-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.3Nikita Popov2019-10-301-0/+1
|\ \ | |/ | | | | | | * PHP-7.2: Add missing refcount increment
| * Add missing refcount incrementNikita Popov2019-10-301-0/+1
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-10-293-1/+23
|\ \ | |/ | | | | | | * PHP-7.2: Fixed bug #78689
| * Fixed bug #78689Nikita Popov2019-10-293-1/+23
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-10-282-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.2Stanislav Malyshev2019-10-282-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 Malyshev2019-10-272-4/+4
| | | | | | | | | | | | Ported from https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84
| | * bump versionJoe Watkins2019-10-223-6/+10
| | |
| | * set versions for releasephp-7.1.33Joe Watkins2019-10-223-3/+3
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-283-6/+23
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #78751: Serialising DatePeriod converts DateTimeImmutable
| * | Fix #78751: Serialising DatePeriod converts DateTimeImmutableChristoph M. Becker2019-10-283-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.3Nikita Popov2019-10-283-8/+38
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix bug #78752
| * | Fix bug #78752Nikita Popov2019-10-283-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.3Nikita Popov2019-10-254-14/+42
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fixed bug #78747
| * | Fixed bug #78747Nikita Popov2019-10-254-13/+42
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-10-231-1/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Use ICU's CXXFLAGS when using pkg-config
| * | Use ICU's CXXFLAGS when using pkg-configRyan Schmidt2019-10-231-1/+2
| | | | | | | | | | | | This mirrors how ICU's CXXFLAGS are already used when using icu-config.
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-10-231-0/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
| * | Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as wellNikita Popov2019-10-231-0/+2
| | | | | | | | | | | | | | | This is a backport of c518932c0326a938f0fd0254f2adb03b1cddfbca from the PHP 7.4 branch.
* | | Update NEWSChristoph M. Becker2019-10-221-0/+3
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Remi Collet2019-10-220-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: add NEWS entry
| * | add NEWS entryRemi Collet2019-10-221-0/+4
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-10-213-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.2Stanislav Malyshev2019-10-213-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 Zelenka2019-10-204-5/+75
| | |
| | * bump versions after releaseJoe Watkins2019-08-283-6/+10
| | |
| | * set versions for releasephp-7.1.32Joe Watkins2019-08-283-4/+12
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-10-214-31/+49
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix bug #78697: inaccurate error message
| * | Fix bug #78697: inaccurate error messageFabien Villepinte2019-10-214-31/+49
| | |
* | | Fix #78633: Heap buffer overflow (read) in mb_eregiChristoph M. Becker2019-10-203-1/+15
| | | | | | | | | | | | We backport kkos/oniguruma@15c4228aa2ffa02140a99912dd3177df0b1841c6.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-193-0/+27
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #78694: Appending to a variant array causes segfault
| * | Fix #78694: Appending to a variant array causes segfaultChristoph M. Becker2019-10-193-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.3Christoph M. Becker2019-10-186-4/+35
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #70153 \DateInterval incorrectly unserialized
| * | Fix #70153 \DateInterval incorrectly unserializedm.yakunin2019-10-186-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.03Derick Rethans2019-10-154-1101/+1091
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-10-144-11/+18
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix checksum calculation for opcache
| * | Fix checksum calculation for opcacheMitch Hagstrand2019-10-144-11/+18
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-122-0/+9
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #78665: Multicasting may leak memory
| * | Fix #78665: Multicasting may leak memoryChristoph M. Becker2019-10-122-0/+9
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-10-102-7/+8
|\ \ \ | |/ /
| * | Fix leak in phar openNikita Popov2019-10-102-7/+8
| | |