summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update versions/dates for PHP 7.1.0PHP-7.1.0Davey Shafik2016-12-023-4/+4
* Update NEWS for releaseDavey Shafik2016-12-011-597/+2309
* Update NEWS for the buildDavey Shafik2016-11-301-1/+1
* Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-284-1/+60
|\
| * Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filte...Dmitry Stogov2016-11-284-1/+60
* | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-283-6/+24
|\ \ | |/
| * Fixed calling generators through magic __call()Dmitry Stogov2016-11-283-20/+64
* | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-272-50/+56
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-270-0/+0
| |\
| | * add NEWSStanislav Malyshev2016-11-271-0/+4
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-272-50/+56
| |\ \ | | |/
| | * Merge branch 'pull-request/1974' into PHP-5.6Stanislav Malyshev2016-11-272-53/+60
| | |\
| | | * Fix #68447: grapheme_extract take an extra trailing characterSATO Kentaro2016-07-012-49/+56
* | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-272-1/+39
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-272-1/+39
| |\ \ \ | | |/ /
| | * | Fix #73549: Use after free when stream is passed to imagepngChristoph M. Becker2016-11-273-1/+42
* | | | Update UPGRADING with info about AEAD changes in openssl_(en|de)cryptJakub Zelenka2016-11-271-0/+2
* | | | Do not add extra timeval entropy when OpenSSL 1.1 usedJakub Zelenka2016-11-271-1/+1
* | | | Clean up and fix php_openssl_dh_pub_from_privJakub Zelenka2016-11-271-3/+3
* | | | Merge branch 'PHP-7.0' into PHP-7.1Matteo Beccati2016-11-271-4/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Matteo Beccati2016-11-271-4/+4
| |\ \ \ | | |/ /
| | * | Fix occasionaly failing testMatteo Beccati2016-11-271-4/+4
* | | | Merge branch 'PHP-7.0' into PHP-7.1Matteo Beccati2016-11-271-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Matteo Beccati2016-11-271-0/+1
| |\ \ \ | | |/ /
| | * | Added missing array key to $JUNITMatteo Beccati2016-11-271-0/+1
* | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-261-1/+1
| |\ \ \ | | |/ /
| | * | acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.Michael Orlitzky2016-11-261-1/+1
| | * | Add more mbfl string size checks (bug #73505)Stanislav Malyshev2016-11-263-3/+33
* | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-262-2/+28
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-262-2/+28
| |\ \ \
| | * | | Add more mbfl string size checks (bug #73505)Stanislav Malyshev2016-11-263-3/+33
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-11-263-5/+33
|\ \ \ \ \ | |/ / / /
| * | | | Fix #73612: preg_*() may leak memoryChristoph M. Becker2016-11-263-5/+35
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-250-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Fix more size_t/int implicit conversionsStanislav Malyshev2016-11-251-66/+149
| * | | | Fix int/size_t confusion in isValidPharFilename (bug #73580)Stanislav Malyshev2016-11-251-0/+4
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-251-66/+149
|\ \ \ \ \
| * | | | | Fix more size_t/int implicit conversionsStanislav Malyshev2016-11-251-66/+149
* | | | | | Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1Stanislav Malyshev2016-11-251-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-11-251-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-11-251-0/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phptChristoph M. Becker2016-11-251-0/+1
| | | | |/ / | | | |/| |
* | | | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-251-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix int/size_t confusion in isValidPharFilename (bug #73580)Stanislav Malyshev2016-11-251-0/+4
| |/ / /
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-241-0/+27
|\ \ \ \ | |/ / /
| * | | add test for bug #57547Anatol Belski2016-11-241-0/+27
* | | | Updated to version 2016.10 (2016j)Derick Rethans2016-11-241-432/+583
* | | | Empty mergeDerick Rethans2016-11-240-0/+0
|\ \ \ \ | |/ / /
| * | | Updated to version 2016.10 (2016j)Derick Rethans2016-11-241-432/+583