summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix #73869: Signed Integer Overflow gd_io.cphp-7.1.1PHP-7.1.1Christoph M. Becker2017-01-174-0/+23
* Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()Christoph M. Becker2017-01-173-2/+24
* missing news entriesJoe Watkins2017-01-171-0/+17
* set version for stable 7.1.1Joe Watkins2017-01-173-4/+4
* bump versions for 7.1.1RC1php-7.1.1RC1Joe Watkins2017-01-053-4/+4
* Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-051-44/+1
|\
| * Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-sr...Anatol Belski2017-01-051-44/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-051-1/+1
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2017-01-051-1/+1
| |\
| | * Fix printf modifierNikita Popov2017-01-051-1/+1
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-051-3/+3
|\ \ \ | |/ /
| * | Merge branch 'pull-request/1256' into PHP-7.0Joe Watkins2017-01-051-3/+3
| |\ \
| | * | Fix php-fpm.service.inFloris Bos2015-05-011-3/+3
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-051-1/+1
|\ \ \ \ | |/ / /
| * | | quick fix for the base branch version parsing, not perfect stillAnatol Belski2017-01-051-1/+1
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-050-0/+0
|\ \ \ \ | |/ / /
| * | | move dev to nextAnatol Belski2017-01-053-5/+9
* | | | Add Z_EXTRA macroNikita Popov2017-01-053-6/+10
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-053-517/+590
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2017-01-053-517/+590
| |\ \ \ | | | |/ | | |/|
| | * | Add tests for delayed __wakeup()Nikita Popov2017-01-057-0/+263
| | * | Implement delayed __wakeupNikita Popov2017-01-052-535/+622
| * | | Merge branch 'pull-request/2273' into PHP-7.0Joe Watkins2017-01-04896-908/+908
| |\ \ \
| | * | | Update copyright header to 2017 in calendar.cSammy Kaye Powers2017-01-041-1/+1
| | * | | Update copyright headers to 2017Sammy Kaye Powers2017-01-04895-907/+907
| |/ / /
* | | | Merge branch 'pull-request/2274' into PHP-7.1Joe Watkins2017-01-04934-946/+946
|\ \ \ \
| * | | | Update copyright header to 2017 in calendar.cSammy Kaye Powers2017-01-041-1/+1
| * | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-04933-945/+945
|/ / / /
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-041-1/+1
|\ \ \ \ | |/ / /
| * | | switch to the beta1 SDK for AppVeyor buildAnatol Belski2017-01-041-1/+1
* | | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-041-4/+0
|\ \ \ \ | |/ / /
| * | | remove duplicate testJoe Watkins2017-01-041-4/+0
* | | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-041-3/+4
|\ \ \ \ | |/ / /
| * | | fix testJoe Watkins2017-01-041-3/+4
* | | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-043-3/+38
|\ \ \ \ | |/ / /
| * | | Merge branch 'pull-request/1312' into PHP-7.0Joe Watkins2017-01-043-3/+38
| |\ \ \
| | * | | Added "exclude_disabled" argument to "get_defined_functions".Willian Gustavo Veiga2015-06-022-4/+17
| | * | | Fix bug #31875 - get_defined_functions() should not list disabled functions.Willian Gustavo Veiga2015-05-302-1/+21
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-032-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Fix PDO tests to match SQL standard syntax and pass Firebird tests.Dorin Marcoci2017-01-032-3/+3
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-031-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | better skip on filesAnatol Belski2017-01-031-2/+4
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-034-2/+51
|\ \ \ \ \ | |/ / / /
| * | | | Fix buildNikita Popov2017-01-031-2/+2
| * | | | Fix Bug #73462 - Persistent connections don't set $connect_errnoVince2017-01-033-0/+49
| * | | | Merge branch 'pull-request/1905'Joe Watkins2017-01-033-11/+519
| * | | | Fix opcache test dependenciesRasmus Lerdorf2017-01-024-10/+12
* | | | | Merge branch 'pull-request/1905'Joe Watkins2017-01-033-11/+519
* | | | | Fix opcache test dependenciesRasmus Lerdorf2017-01-024-10/+12
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-01-022-2/+2
|\ \ \ \ \ | |/ / / /