summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-01-041-1/+1
|\ \ | |/
| * Fixed bug #63899 (Use after scope error in zend_compile)Xinchen Hui2013-01-041-1/+1
| |
| * Happy New YearXinchen Hui2013-01-0196-98/+98
| |
* | Bug #43177: If an eval() has a parse error, the overall exit status and ↵Stanislav Malyshev2013-01-011-1/+7
| | | | | | | | | | | | | | return code should not be affected. Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
* | Happy New YearXinchen Hui2013-01-0196-98/+98
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-261-1/+3
|\ \ | |/
| * Revert "Remove a useless memory write in zend_llist_del_element"Pierrick Charron2012-12-261-1/+3
| | | | | | | | | | This reverts commit fad960a4045da86cdbd8308a165ffc47892f05b9 as required by Stas and Christopher
* | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-251-3/+1
|\ \ | |/ | | | | | | * PHP-5.3: Remove a useless memory write in zend_llist_del_element
| * Remove a useless memory write in zend_llist_del_elementPierrick Charron2012-12-251-3/+1
| | | | | | | | | | The zend_llist_element *next pointer is not necessary and removing it will also remove a write on memory
* | spellingDmitry Stogov2012-12-252-5/+5
| |
* | Fixed ZTS buildDmitry Stogov2012-12-251-2/+2
| |
* | Traits refactoringDmitry Stogov2012-12-2518-429/+341
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-12-132-15/+92
|\ \ | |/
| * Fix Bug #63762 Sigsegv when Exception::$trace is changed by userJohannes Schlüter2012-12-132-15/+92
| |
| * Fixed bug #63726 (Memleak with static properties and internal/user classes)Xinchen Hui2012-12-102-0/+4
| |
* | Fixed bug #63726 (Memleak with static properties and internal/user classes)Xinchen Hui2012-12-103-1/+5
| | | | | | | | No test scripts provided (will try to find one)
* | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2012-11-292-2/+62
|\ \ | |/ | | | | | | | | | | | | * PHP-5.3: Fixed bug #63635 (Segfault in gc_collect_cycles) Conflicts: NEWS
| * Fixed bug #63635 (Segfault in gc_collect_cycles)Dmitry Stogov2012-11-292-2/+62
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2012-11-202-1/+31
|\ \ | |/ | | | | | | | | | | | | * PHP-5.3: Fixed bug #63468 (wrong called method as callback with inheritance) Conflicts: NEWS
| * Fixed bug #63468 (wrong called method as callback with inheritance)Dmitry Stogov2012-11-202-1/+31
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-11-162-1349/+1335
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.3: Regenerate Zend ini scanner Conflicts: Zend/zend_ini_scanner.c Zend/zend_ini_scanner_defs.h
| * Regenerate Zend ini scannerPierrick Charron2012-11-162-1349/+1335
| | | | | | | | Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h
* | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-11-161-18/+25
|\ \ | |/ | | | | | | * PHP-5.3: Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
| * Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from valuePierrick Charron2012-11-161-18/+25
| | | | | | | | Restore the old behavior but keep bug 51094 fixed
* | Fixed compiler reenterabilityDmitry Stogov2012-11-142-342/+344
| |
* | Fixed compiler reenterabilityDmitry Stogov2012-11-142-0/+3
| |
* | Update test scriptXinchen Hui2012-10-231-3/+3
| |
* | Test for #63336, xfail nowXinchen Hui2012-10-231-0/+24
| |
* | Fixed bug #63305 (zend_mm_heap corrupted with traits)Xinchen Hui2012-10-232-2/+45
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-191-0/+23
|\ \ | |/
| * preg indenpent test script for #63055Xinchen Hui2012-10-191-0/+23
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-10-181-1/+1
|\ \ | |/ | | | | | | Conflicts: Zend/acinclude.m4
| * SUpport newer bisons.Derick Rethans2012-10-181-1/+1
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-181-0/+2
|\ \ | |/
| * better fix for #63055Xinchen Hui2012-10-181-0/+2
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-181-23/+0
|\ \ | |/
* | I forgot that inconsistent is only avaliable in debug modeXinchen Hui2012-10-181-1/+1
| |
* | Add commentsXinchen Hui2012-10-181-3/+3
| |
* | Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)Xinchen Hui2012-10-182-1/+24
| | | | | | | | This should also fixed various segfaults which the bt looks like cored in zval_mark_grey
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-105-0/+0
|\ \ | |/
| * Remove executable permission on incXinchen Hui2012-10-105-0/+0
| |
* | Remove executable permission on phptXinchen Hui2012-10-106-0/+0
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-10267-0/+0
|\ \ | |/
| * Remove executable permission on phptXinchen Hui2012-10-10268-0/+0
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-095-0/+0
|\ \ | |/
| * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-095-0/+0
| |
* | Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws ↵Xinchen Hui2012-10-082-4/+28
| | | | | | | | excpetion)
* | Fix bug #63173: Crash when invoking invalid array callbackNikita Popov2012-09-273-0/+32
| | | | | | | | | | | | The code did not check whether the zend_hash_index_find calls succeded, so PHP crashed when an array callback was called that contains two elements which don't have the indices 0 and 1.
* | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2012-09-212-1/+44
|\ \ | |/ | | | | | | | | | | | | * PHP-5.3: Fixed bug #63111 (is_callable() lies for abstract static method) Conflicts: NEWS
| * Fixed bug #63111 (is_callable() lies for abstract static method)Dmitry Stogov2012-09-212-1/+44
| |
View Lorry Controller Status