Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update versions for PHP 7.2.0RC5php-7.2.0RC5 | Sara Golemon | 2017-10-24 | 2 | -3/+3 |
| | |||||
* | Update NEWS for PHP 7.2.0RC5 | Sara Golemon | 2017-10-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'PHP-7.1' into PHP-7.2 | Sara Golemon | 2017-10-24 | 1 | -0/+1 |
|\ | | | | | | | | | * PHP-7.1: Decref default_link when clearing | ||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Sara Golemon | 2017-10-24 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | * PHP-7.0: Decref default_link when clearing | ||||
| | * | Decref default_link when clearing | Sara Golemon | 2017-10-24 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Christoph M. Becker | 2017-10-24 | 4 | -22/+247 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: Fixed bug #65148 (imagerotate may alter image dimensions) | ||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2017-10-24 | 4 | -22/+247 |
| |\ \ | | |/ | | | | | | | | | | * PHP-7.0: Fixed bug #65148 (imagerotate may alter image dimensions) | ||||
| | * | Fixed bug #65148 (imagerotate may alter image dimensions) | Christoph M. Becker | 2017-10-24 | 4 | -22/+247 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We apply the respective patches from external libgd, work around the still missing `gdImageClone()`, and fix the special cased rotation routines according to Pierre's patch (https://gist.github.com/pierrejoye/59d72385ed1888cf8894a7ed437235ae). We also cater to bug73272.phpt whose result obviously changes a bit. | ||||
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Derick Rethans | 2017-10-24 | 1 | -7/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Derick Rethans | 2017-10-24 | 1 | -489/+14 |
| |\ \ | | |/ | |||||
| | * | Update timezonemap.h, which needs to match the bundled TZ db | Derick Rethans | 2017-10-24 | 1 | -736/+44 |
| | | | |||||
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-10-24 | 0 | -0/+0 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: Fix test | ||||
| * | | Fix test | Anatol Belski | 2017-10-24 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-10-24 | 0 | -0/+0 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * PHP-7.1: [ci skip] update NEWS [ci skip] update NEWS [ci skip] update NEWS | ||||
| * | | [ci skip] update NEWS | Anatol Belski | 2017-10-24 | 1 | -0/+9 |
| | | | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-10-24 | 0 | -0/+0 |
| |\ \ | | |/ | | | | | | | | | | | | | * PHP-7.0: [ci skip] update NEWS [ci skip] update NEWS | ||||
| | * | [ci skip] update NEWS | Anatol Belski | 2017-10-24 | 1 | -0/+9 |
| | | | |||||
| | * | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2017-10-24 | 0 | -0/+0 |
| | |\ | | | | | | | | | | | | | | | | | * PHP-5.6: [ci skip] update NEWS | ||||
| | | * | [ci skip] update NEWS | Anatol Belski | 2017-10-24 | 1 | -0/+9 |
| | | | | |||||
* | | | | [ci skip] update NEWS | Anatol Belski | 2017-10-24 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-10-24 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.1: Fixed bug #72535 arcfour encryption stream filter crashes php | ||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-10-24 | 2 | -1/+24 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | * PHP-7.0: Fixed bug #72535 arcfour encryption stream filter crashes php | ||||
| | * | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2017-10-24 | 2 | -1/+24 |
| | |\ \ | | | |/ | | | | | | | | | | | | | * PHP-5.6: Fixed bug #72535 arcfour encryption stream filter crashes php | ||||
| | | * | Fixed bug #72535 arcfour encryption stream filter crashes php | Anatol Belski | 2017-10-24 | 2 | -1/+24 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-10-24 | 4 | -2/+35 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | * PHP-7.1: Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian() Apply upstream patch for CVE-2016-1283 | ||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-10-24 | 5 | -925/+1066 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | * PHP-7.0: Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian() Apply upstream patch for CVE-2016-1283 | ||||
| | * | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2017-10-24 | 5 | -717/+2337 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian() Apply upstream patch for CVE-2016-1283 | ||||
| | | * | Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian() | Anatol Belski | 2017-10-24 | 5 | -716/+2336 |
| | | | | |||||
| | | * | Apply upstream patch for CVE-2016-1283 | Anatol Belski | 2017-10-24 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #75207, see also https://bugzilla.redhat.com/show_bug.cgi?id=1295385 https://vcs.pcre.org/pcre?view=revision&revision=1636 (cherry picked from commit d11fceab151cd0410645f81eb7444af4388470c3) | ||||
* | | | | Merge branch 'PHP-7.1' into PHP-7.2 | Sara Golemon | 2017-10-23 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.1: NEWS entry for pg_close() fix | ||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Sara Golemon | 2017-10-23 | 1 | -0/+3 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | * PHP-7.0: NEWS entry for pg_close() fix | ||||
| | * | | NEWS entry for pg_close() fix | Sara Golemon | 2017-10-23 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.1' into PHP-7.2 | Sara Golemon | 2017-10-23 | 2 | -13/+21 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.1: Bugfix#75419 Fix clearing of default link during pg_close() | ||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Sara Golemon | 2017-10-23 | 2 | -13/+21 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | * PHP-7.0: Bugfix#75419 Fix clearing of default link during pg_close() | ||||
| | * | | Bugfix#75419 Fix clearing of default link during pg_close() | Sara Golemon | 2017-10-23 | 2 | -13/+21 |
| | | | | |||||
* | | | | Update libmagic.patch | Anatol Belski | 2017-10-23 | 1 | -17/+27 |
| | | | | |||||
* | | | | Fail hard when re2c is not found or the version requirement not met | Anatol Belski | 2017-10-23 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | With 7.2, the binary SDK supplies the minimal required version, thus no reason to fail later at the compilation time. | ||||
* | | | | Fix mismatching alloc | Anatol Belski | 2017-10-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Updated to version 2017.3 (2017c) | Derick Rethans | 2017-10-23 | 1 | -1078/+1009 |
| | | | | |||||
* | | | | Empty merge | Derick Rethans | 2017-10-23 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Updated to version 2017.3 (2017c) | Derick Rethans | 2017-10-23 | 1 | -1078/+1009 |
| | | | | |||||
| * | | | Empty merge | Derick Rethans | 2017-10-23 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Updated to version 2017.3 (2017c) | Derick Rethans | 2017-10-23 | 1 | -1078/+1009 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-10-23 | 1 | -1/+4 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.1: Fix memory leak | ||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-10-23 | 1 | -1/+4 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | * PHP-7.0: Fix memory leak | ||||
| | * | | Fix memory leak | Anatol Belski | 2017-10-23 | 1 | -1/+4 |
| | | | | |||||
* | | | | Fix uninitialized vars | Anatol Belski | 2017-10-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-10-23 | 1 | -5/+5 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | * PHP-7.1: Renaming cache folder is not a solution, too. Disable cache for now. Revert "Rename build cache folder and separate sdk" | ||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-10-23 | 1 | -5/+5 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | * PHP-7.0: Renaming cache folder is not a solution, too. Disable cache for now. Revert "Rename build cache folder and separate sdk" | ||||
| | * | | Renaming cache folder is not a solution, too. Disable cache for now. | Anatol Belski | 2017-10-23 | 1 | -3/+3 |
| | | | |