summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Fixed bug #68676 (Explicit Double Free)Kalle Sommer Nielsen2014-12-291-1/+1
* Fix bug #67111Nikita Popov2014-12-191-0/+20
* Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)Kévin Dunglas2014-12-123-2/+66
* Fixed bug #68583 Crash in timeout threadAnatol Belski2014-12-123-128/+41
* Fixed bug #55541 errors spawn MessageBox, which blocks test automationAnatol Belski2014-12-031-3/+6
* Fix #65419 - Inside trait, self::class != __CLASS__Julien Pauli2014-11-282-0/+29
* 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
* | 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
|\ \
| * \ 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 #68370 ("unset($this)" can make the program crash)Xinchen Hui2014-11-102-7/+18
|/ /
* | Fix bug #68188Nikita Popov2014-10-032-3/+27
* | Fixed bug #67633Nikita Popov2014-09-202-0/+53
* | 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.4' into PHP-5.5Stanislav Malyshev2014-09-013-2/+18
|\ \ | |/
| * Merge branch 'pull-request/770' into PHP-5.4Stanislav Malyshev2014-09-013-2/+18
| |\
| | * Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)Keyur Govande2014-08-231-9/+12
| | * Fix typo from commit 32314f6b6Keyur Govande2014-08-141-1/+1
| | * Fix destruction order in zend_shutdown (bug #65463, #66036)Keyur Govande2014-08-143-3/+16
* | | Improve fix for #66608Xinchen Hui2014-07-195-35/+104
* | | Fixed segfault with empty breakXinchen Hui2014-07-192-9/+25
* | | New added opcodes don't need to be reslovedXinchen Hui2014-07-191-2/+2
* | | Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)Xinchen Hui2014-07-185-7/+78
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-062-2/+2
|\ \ \ | |/ /
| * | Make sure the generator script also creates a newline at the end of fileLior Kaplan2014-07-061-1/+1
| * | Add newline at end of file to prevent compilation warningLior Kaplan2014-07-061-1/+1
* | | Fix bug #67497: eval with parse error causes segfault in generatorNikita Popov2014-07-022-0/+20
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-161-2/+2
|\ \ \ | |/ /
| * | Fix patch for bug #67436Bob Weinand2014-06-161-2/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-165-0/+73
|\ \ \ | |/ /
| * | Added tests for bug 67436Levi Morrison2014-06-155-0/+73
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-151-3/+6
|\ \ \ | |/ /
| * | Fix bug #67436Bob Weinand2014-06-151-3/+6
| * | Fix bug 666222Levi Morrison2014-06-084-5/+54
* | | Remove unused included fileXinchen Hui2014-06-101-2/+0
* | | Fix bug 666222Levi Morrison2014-06-0812-5/+226
* | | Merge branch 'PHp-5.4' into PHP-5.5Stanislav Malyshev2014-06-081-16/+16
|\ \ \ | |/ /
| * | Fix align indentationJefersson Nathan2014-06-081-16/+16
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-05-111-1/+1
|\ \ \ | |/ /
| * | Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)Bob Weinand2014-05-111-1/+1
* | | refixed the test related to bug #67072Anatol Belski2014-04-181-4/+4
* | | Fixed test case for 5328d42Tjerk Meesters2014-04-171-3/+2
* | | typo spotted by Lajos VeresFerenc Kovacs2014-02-271-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-02-231-1/+1
|\ \ \ | |/ /
| * | Make sure value is initializedJohannes Schlüter2014-02-231-1/+1