Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Disallow non-crypto hashes in HMAC and PBKDF2 | Andrey Andreev | 2017-01-18 | 21 | -73/+107 |
* | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-18 | 3 | -3/+28 |
|\ | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-18 | 3 | -3/+28 |
| |\ | |||||
| | * | Fix bug #73949 leak in mysqli_fetch_object | Joe Watkins | 2017-01-18 | 3 | -3/+28 |
* | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-18 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-18 | 2 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Remove remnants of TSMRLS_* macro calls | Thomas Punt | 2017-01-18 | 2 | -2/+2 |
* | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-18 | 2 | -2/+59 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-18 | 2 | -2/+59 |
| |\ \ | | |/ | |||||
| | * | DNS CAA record type implementation and tests for https://bugs.php.net/bug.php... | Marcus Bointon | 2017-01-18 | 2 | -2/+59 |
* | | | Merge branch 'PHP-7.1' | Leigh | 2017-01-18 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Add php_openssl_store_errors to bailouts | Leigh | 2017-01-18 | 1 | -0/+2 |
* | | | Merge branch 'PHP-7.1' | Leigh | 2017-01-18 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Leigh | 2017-01-18 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Change free to OPENSSL_free | Leigh | 2017-01-18 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.1' | Remi Collet | 2017-01-18 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | NEWS | Remi Collet | 2017-01-18 | 1 | -0/+3 |
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Remi Collet | 2017-01-18 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | NEWS | Remi Collet | 2017-01-18 | 1 | -0/+3 |
| | * | Fix #73956 Link use CC instead of CXX | Remi Collet | 2017-01-18 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-18 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Remove more TSRMLS_CC macros | Thomas Punt | 2017-01-18 | 1 | -2/+2 |
* | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-18 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-18 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fix ce comparison | Thomas Punt | 2017-01-18 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-17 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-17 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | updates to release docs | Joe Watkins | 2017-01-17 | 1 | -2/+2 |
* | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-17 | 1 | -12/+33 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-17 | 1 | -12/+33 |
| |\ \ | | |/ | |||||
| | * | Fixes in .gdbinit for ZE 3 | Mitch Hagstrand | 2017-01-17 | 1 | -12/+33 |
* | | | Merge branch 'PHP-7.1' | Anatol Belski | 2017-01-17 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-17 | 0 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | [ci skip] sync NEWS | Anatol Belski | 2017-01-17 | 1 | -3/+28 |
* | | | fix changed symbol | Anatol Belski | 2017-01-17 | 1 | -2/+2 |
* | | | Merge branch 'PHP-7.1' | Anatol Belski | 2017-01-17 | 6 | -2/+47 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-17 | 6 | -2/+47 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2017-01-17 | 6 | -2/+47 |
| | |\ | |||||
| | | * | Fix #73869: Signed Integer Overflow gd_io.c | Christoph M. Becker | 2017-01-17 | 4 | -0/+23 |
| | | * | Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx() | Christoph M. Becker | 2017-01-17 | 3 | -2/+24 |
* | | | | Separate zend_fetch_static_property_address() into an inline function | Dmitry Stogov | 2017-01-17 | 3 | -800/+95 |
* | | | | Merge branch 'PHP-7.1' | Xinchen Hui | 2017-01-17 | 2 | -1/+22 |
|\ \ \ \ | |/ / / | |||||
| * | | | Update NEWS | Xinchen Hui | 2017-01-17 | 1 | -0/+4 |
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-01-17 | 2 | -1/+22 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache) | Xinchen Hui | 2017-01-17 | 3 | -1/+26 |
* | | | | Merge branch 'PHP-7.1' | Stanislav Malyshev | 2017-01-16 | 1 | -6/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Stanislav Malyshev | 2017-01-16 | 1 | -6/+10 |
| |\ \ \ | |||||
| | * | | | Fix bug #73648 - integer overflow in substr | Stanislav Malyshev | 2017-01-16 | 1 | -6/+6 |
* | | | | | Merge branch 'PHP-7.1' | Nikita Popov | 2017-01-16 | 4 | -1/+129 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Make unserialize() ref unwrapping compatible with 7.0 | Nikita Popov | 2017-01-16 | 2 | -2/+10 |