summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* import explicit_bzero + strlc* functions updateDavid Carlier2016-10-151-1/+1
* Merge branch 'PHP-7.1'Christoph M. Becker2016-10-145-4096/+3954
|\
| * Implement #72918: negative offset inside a quoted string leads to parse errorChristoph M. Becker2016-10-145-4096/+3954
| * missed piece for renamingAnatol Belski2016-10-141-4/+4
| * rename publicly exposed symbol to avoid name conflictsAnatol Belski2016-10-141-1/+1
| * Revert "export symbol missing by phpdbg"Anatol Belski2016-10-143-14/+12
| * Fix potential overflows in php_pcre_replace_implStanislav Malyshev2016-10-142-15/+14
| * fix another mistakeAnatol Belski2016-10-141-1/+1
| * Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-10-143-3966/+4135
| * export symbol missing by phpdbgAnatol Belski2016-10-143-12/+14
| * fix wrong mergeAnatol Belski2016-10-141-4/+3
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-141-4/+21
| * finish 7.1 portAnatol Belski2016-10-141-3/+3
| * Fix bug #73147: Use After Free in PHP7 unserialize()Stanislav Malyshev2016-10-142-0/+19
| * Fixed bug #73288 (Segfault in __clone > Exception.toString > __get)Xinchen Hui2016-10-143-15/+64
| * Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-10-085-34/+72
| |\
* | \ Merge branch 'PHP-7.1'Anatol Belski2016-10-131-4/+4
|\ \ \
| * \ \ Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-131-4/+4
| |\ \ \
| | * | | missed piece for renamingAnatol Belski2016-10-131-4/+4
* | | | | Merge branch 'PHP-7.1'Anatol Belski2016-10-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | rename publicly exposed symbol to avoid name conflictsAnatol Belski2016-10-131-1/+1
| * | | | Revert "Merge branch 'pull-request/2082' (get_class accidentally in PHP-7.1)"Bob Weinand2016-10-132-10/+1
|/ / / /
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-133-14/+12
|\ \ \ \ | |/ / /
| * | | Revert "export symbol missing by phpdbg"Anatol Belski2016-10-133-14/+12
* | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-10-122-15/+14
|\ \ \ \ | |/ / /
| * | | Fix potential overflows in php_pcre_replace_implStanislav Malyshev2016-10-122-15/+14
* | | | fix another mistakeAnatol Belski2016-10-121-1/+1
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-10-123-3966/+4135
|\ \ \ \ | |/ / /
| * | | Fix line number of implicit return in pseudo-main scopeNikita Popov2016-10-123-3959/+4131
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-123-12/+14
|\ \ \ \ | |/ / /
| * | | export symbol missing by phpdbgAnatol Belski2016-10-123-12/+14
* | | | fix wrong mergeAnatol Belski2016-10-121-4/+3
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-121-4/+21
|\ \ \ \ | |/ / /
| * | | Fix bug #73190: memcpy negative parameter _bc_new_num_exStanislav Malyshev2016-10-121-5/+21
* | | | finish 7.1 portAnatol Belski2016-10-121-3/+3
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-122-0/+19
|\ \ \ \ | |/ / /
| * | | Fix bug #73147: Use After Free in PHP7 unserialize()Stanislav Malyshev2016-10-122-0/+19
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-122-22/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0.12' into PHP-7.0Stanislav Malyshev2016-10-112-22/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"Anatol Belski2016-10-112-22/+0
| * | | Fix bug #66773, #66862Nikita Popov2016-10-085-34/+72
* | | | Fixed bug #73288 (Segfault in __clone > Exception.toString > __get)Xinchen Hui2016-10-123-15/+64
* | | | Merge branch 'pull-request/2082'Joe Watkins2016-10-102-1/+10
|\ \ \ \
| * | | | Add test.Danack2016-08-131-0/+9
| * | | | Require parameter to be an object if passed.Danack2016-08-111-1/+1
* | | | | Fix "already in use" check inconsistencies/bugsNikita Popov2016-10-0711-51/+108
* | | | | Merge branch 'PHP-7.1'Nikita Popov2016-09-302-0/+42
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Unwrap reference returns in cufa etcNikita Popov2016-09-302-0/+42
* | | | | Merge branch 'PHP-7.1'Xinchen Hui2016-09-302-118/+75
|\ \ \ \ \ | |/ / / /