Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 1 | -0/+1 |
|\ | |||||
| * | Added test and possible fix for https://bugs.php.net/bug.php?id=67068 | Danack | 2015-01-31 | 1 | -0/+1 |
| * | Bump year | Xinchen Hui | 2015-01-15 | 99 | -101/+101 |
| * | Fixed bug #68676 (Explicit Double Free) | Kalle Sommer Nielsen | 2014-12-29 | 1 | -1/+1 |
* | | bump year | Xinchen Hui | 2015-01-15 | 103 | -105/+105 |
* | | Fixed bug #68676 (Explicit Double Free) | Kalle Sommer Nielsen | 2014-12-29 | 1 | -1/+1 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2014-12-19 | 1 | -0/+20 |
|\ \ | |/ | |||||
| * | Fix bug #67111 | Nikita Popov | 2014-12-19 | 1 | -0/+20 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2014-12-12 | 3 | -2/+66 |
|\ \ | |/ | |||||
| * | Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor) | Kévin Dunglas | 2014-12-12 | 3 | -2/+66 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-12 | 3 | -128/+41 |
|\ \ | |/ | |||||
| * | Fixed bug #68583 Crash in timeout thread | Anatol Belski | 2014-12-12 | 3 | -128/+41 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-03 | 1 | -3/+6 |
|\ \ | |/ | |||||
| * | Fixed bug #55541 errors spawn MessageBox, which blocks test automation | Anatol Belski | 2014-12-03 | 1 | -3/+6 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2014-11-28 | 2 | -0/+29 |
|\ \ | |/ | |||||
| * | Fix #65419 - Inside trait, self::class != __CLASS__ | Julien Pauli | 2014-11-28 | 2 | -0/+29 |
* | | #68446 is fixed | Ferenc Kovacs | 2014-11-26 | 1 | -2/+0 |
* | | fix dir separator in test | Anatol Belski | 2014-11-25 | 1 | -1/+1 |
* | | fix TS build | Anatol Belski | 2014-11-25 | 1 | -4/+4 |
* | | Better fix for bug #68446 | Dmitry Stogov | 2014-11-25 | 4 | -17/+41 |
* | | Revert NEWS and set test to XFAIL | Bob Weinand | 2014-11-25 | 1 | -0/+2 |
* | | Revert "Fix bug #68446 (bug with constant defaults and type hints)" | Bob Weinand | 2014-11-25 | 5 | -80/+47 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-11-23 | 4 | -0/+14 |
|\ \ | |/ | |||||
| * | Merge branch 'pull-request/840' into PHP-5.5 | Stanislav Malyshev | 2014-11-23 | 4 | -0/+14 |
| |\ | |||||
| | * | Update the VM generation script, per Bob. | Adam Harvey | 2014-10-31 | 1 | -0/+2 |
| | * | Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them. | Adam Harvey | 2014-10-31 | 3 | -0/+12 |
* | | | Added NEWS entry and test for bug 68446 | Bob Weinand | 2014-11-24 | 1 | -0/+36 |
* | | | Fix bug #68446 (bug with constant defaults and type hints) | Bob Weinand | 2014-11-23 | 5 | -47/+80 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2014-11-21 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix #68185 - Inconsistent insteadof definition | Julien Pauli | 2014-11-21 | 1 | -1/+1 |
| * | | fix incompatible pointer types | Anatol Belski | 2014-11-17 | 1 | -2/+6 |
| * | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 | Xinchen Hui | 2014-11-10 | 1 | -1/+1 |
| |\ \ | |||||
* | | | | fix incompatible pointer types | Anatol Belski | 2014-11-17 | 1 | -2/+6 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-11-10 | 2 | -7/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug #68370 ("unset($this)" can make the program crash) | Xinchen Hui | 2014-11-10 | 2 | -7/+18 |
| | |/ | |/| | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2014-11-07 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2014-11-07 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in z... | Dmitry Stogov | 2014-11-07 | 1 | -1/+1 |
* | | | Fixed Bug #68104 (Segfault while pre-evaluating a disabled function) | Xinchen Hui | 2014-10-31 | 1 | -9/+6 |
* | | | DLL export several APIs needed for phpdbg | Anatol Belski | 2014-10-12 | 4 | -4/+4 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2014-10-03 | 2 | -3/+27 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #68188 | Nikita Popov | 2014-10-03 | 2 | -3/+27 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2014-09-20 | 2 | -0/+53 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #67633 | Nikita Popov | 2014-09-20 | 2 | -0/+53 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-09-09 | 2 | -0/+17 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Tjerk Meesters | 2014-09-09 | 2 | -0/+17 |
| |\ \ | | |/ | |||||
| | * | Fixed #67985 - Incorrect last used array index copied to new array after unset | Tjerk Meesters | 2014-09-09 | 2 | -0/+17 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-09-01 | 3 | -2/+18 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-09-01 | 3 | -2/+18 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'pull-request/770' into PHP-5.4 | Stanislav Malyshev | 2014-09-01 | 3 | -2/+18 |
| | |\ |