summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-0/+1
|\
| * Added test and possible fix for https://bugs.php.net/bug.php?id=67068Danack2015-01-311-0/+1
| * Bump yearXinchen Hui2015-01-1599-101/+101
| * Fixed bug #68676 (Explicit Double Free)Kalle Sommer Nielsen2014-12-291-1/+1
* | bump yearXinchen Hui2015-01-15103-105/+105
* | Fixed bug #68676 (Explicit Double Free)Kalle Sommer Nielsen2014-12-291-1/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-12-191-0/+20
|\ \ | |/
| * Fix bug #67111Nikita Popov2014-12-191-0/+20
* | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-123-2/+66
|\ \ | |/
| * Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)Kévin Dunglas2014-12-123-2/+66
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-123-128/+41
|\ \ | |/
| * Fixed bug #68583 Crash in timeout threadAnatol Belski2014-12-123-128/+41
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-031-3/+6
|\ \ | |/
| * Fixed bug #55541 errors spawn MessageBox, which blocks test automationAnatol Belski2014-12-031-3/+6
* | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-11-282-0/+29
|\ \ | |/
| * Fix #65419 - Inside trait, self::class != __CLASS__Julien Pauli2014-11-282-0/+29
* | #68446 is fixedFerenc Kovacs2014-11-261-2/+0
* | fix dir separator in testAnatol Belski2014-11-251-1/+1
* | fix TS buildAnatol Belski2014-11-251-4/+4
* | Better fix for bug #68446Dmitry Stogov2014-11-254-17/+41
* | Revert NEWS and set test to XFAILBob Weinand2014-11-251-0/+2
* | Revert "Fix bug #68446 (bug with constant defaults and type hints)"Bob Weinand2014-11-255-80/+47
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-234-0/+14
|\ \ | |/
| * Merge branch 'pull-request/840' into PHP-5.5Stanislav Malyshev2014-11-234-0/+14
| |\
| | * Update the VM generation script, per Bob.Adam Harvey2014-10-311-0/+2
| | * Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.Adam Harvey2014-10-313-0/+12
* | | Added NEWS entry and test for bug 68446Bob Weinand2014-11-241-0/+36
* | | Fix bug #68446 (bug with constant defaults and type hints)Bob Weinand2014-11-235-47/+80
* | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-11-211-2/+2
|\ \ \ | |/ /
| * | Fix #68185 - Inconsistent insteadof definitionJulien Pauli2014-11-211-1/+1
| * | fix incompatible pointer typesAnatol Belski2014-11-171-2/+6
| * | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-11-101-1/+1
| |\ \
* | | | fix incompatible pointer typesAnatol Belski2014-11-171-2/+6
* | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-11-102-7/+18
|\ \ \ \ | |/ / /
| * | | Fixed bug #68370 ("unset($this)" can make the program crash)Xinchen Hui2014-11-102-7/+18
| | |/ | |/|
* | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-11-071-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-11-071-1/+1
| |\ \ | | |/ | |/|
| | * Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in z...Dmitry Stogov2014-11-071-1/+1
* | | Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)Xinchen Hui2014-10-311-9/+6
* | | DLL export several APIs needed for phpdbgAnatol Belski2014-10-124-4/+4
* | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-10-032-3/+27
|\ \ \ | |/ /
| * | Fix bug #68188Nikita Popov2014-10-032-3/+27
* | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-09-202-0/+53
|\ \ \ | |/ /
| * | Fixed bug #67633Nikita Popov2014-09-202-0/+53
* | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-09-092-0/+17
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-09-092-0/+17
| |\ \ | | |/
| | * Fixed #67985 - Incorrect last used array index copied to new array after unsetTjerk Meesters2014-09-092-0/+17
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-09-013-2/+18
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-013-2/+18
| |\ \ | | |/
| | * Merge branch 'pull-request/770' into PHP-5.4Stanislav Malyshev2014-09-013-2/+18
| | |\