summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disallow non-crypto hashes in HMAC and PBKDF2Andrey Andreev2017-01-1821-73/+107
* Merge branch 'PHP-7.1'Joe Watkins2017-01-183-3/+28
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-183-3/+28
| |\
| | * Fix bug #73949 leak in mysqli_fetch_objectJoe Watkins2017-01-183-3/+28
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-182-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-182-2/+2
| |\ \ | | |/
| | * Remove remnants of TSMRLS_* macro callsThomas Punt2017-01-182-2/+2
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-182-2/+59
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-182-2/+59
| |\ \ | | |/
| | * DNS CAA record type implementation and tests for https://bugs.php.net/bug.php...Marcus Bointon2017-01-182-2/+59
* | | Merge branch 'PHP-7.1'Leigh2017-01-181-0/+2
|\ \ \ | |/ /
| * | Add php_openssl_store_errors to bailoutsLeigh2017-01-181-0/+2
* | | Merge branch 'PHP-7.1'Leigh2017-01-181-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Leigh2017-01-181-1/+1
| |\ \ | | |/
| | * Change free to OPENSSL_freeLeigh2017-01-181-1/+1
* | | Merge branch 'PHP-7.1'Remi Collet2017-01-181-1/+1
|\ \ \ | |/ /
| * | NEWSRemi Collet2017-01-181-0/+3
| * | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-01-181-1/+1
| |\ \ | | |/
| | * NEWSRemi Collet2017-01-181-0/+3
| | * Fix #73956 Link use CC instead of CXXRemi Collet2017-01-181-1/+1
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-181-2/+2
|\ \ \ | |/ /
| * | Remove more TSRMLS_CC macrosThomas Punt2017-01-181-2/+2
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-181-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-181-1/+1
| |\ \ | | |/
| | * Fix ce comparisonThomas Punt2017-01-181-1/+1
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-171-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-171-2/+2
| |\ \ | | |/
| | * updates to release docsJoe Watkins2017-01-171-2/+2
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-171-12/+33
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-171-12/+33
| |\ \ | | |/
| | * Fixes in .gdbinit for ZE 3Mitch Hagstrand2017-01-171-12/+33
* | | Merge branch 'PHP-7.1'Anatol Belski2017-01-170-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-170-0/+0
| |\ \ | | |/
| | * [ci skip] sync NEWSAnatol Belski2017-01-171-3/+28
* | | fix changed symbolAnatol Belski2017-01-171-2/+2
* | | Merge branch 'PHP-7.1'Anatol Belski2017-01-176-2/+47
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-176-2/+47
| |\ \ | | |/
| | * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2017-01-176-2/+47
| | |\
| | | * Fix #73869: Signed Integer Overflow gd_io.cChristoph M. Becker2017-01-174-0/+23
| | | * Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()Christoph M. Becker2017-01-173-2/+24
* | | | Separate zend_fetch_static_property_address() into an inline functionDmitry Stogov2017-01-173-800/+95
* | | | Merge branch 'PHP-7.1'Xinchen Hui2017-01-172-1/+22
|\ \ \ \ | |/ / /
| * | | Update NEWSXinchen Hui2017-01-171-0/+4
| * | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-01-172-1/+22
| |\ \ \ | | |/ /
| | * | Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)Xinchen Hui2017-01-173-1/+26
* | | | Merge branch 'PHP-7.1'Stanislav Malyshev2017-01-161-6/+10
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-01-161-6/+10
| |\ \ \
| | * | | Fix bug #73648 - integer overflow in substrStanislav Malyshev2017-01-161-6/+6
* | | | | Merge branch 'PHP-7.1'Nikita Popov2017-01-164-1/+129
|\ \ \ \ \ | |/ / / /
| * | | | Make unserialize() ref unwrapping compatible with 7.0Nikita Popov2017-01-162-2/+10