summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-01-092-3/+4
|\ | | | | | | | | * PHP-5.4: Fixed compilator bug that might cause jump depended on unitialized value
| * Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-01-092-3/+4
| |\ | | | | | | | | | | | | * PHP-5.3: Fixed compilator bug that might cause jump depended on unitialized value
| | * Fixed compilator bug that might cause jump depended on unitialized valueDmitry Stogov2013-01-092-3/+4
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-01-094-0/+43
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #63882 (zend_std_compare_objects crash on recursion) Conflicts: NEWS
| * | Fixed bug #63882 (zend_std_compare_objects crash on recursion)Dmitry Stogov2013-01-094-0/+43
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-01-041-1/+1
|\ \ \ | |/ /
| * | 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
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-011-1/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. fix NEWS Conflicts: main/main.c
| * | 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
* | | Happy New YearXinchen Hui2013-01-0198-100/+100
| | |
* | | Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)Pierrick Charron2012-12-291-1/+0
| | | | | | | | | | | | | | | T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c Bugfix by Nikita for bug #60097
* | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-251-3/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Remove a useless memory write in zend_llist_del_element
| * | 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-251-3/+3
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-252-5/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: spelling
| * | spellingDmitry Stogov2012-12-252-5/+5
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-251-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed ZTS build
| * | Fixed ZTS buildDmitry Stogov2012-12-251-2/+2
| | |
* | | Removed deprecated fieldsDmitry Stogov2012-12-252-8/+0
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-2518-429/+341
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Traits refactoring
| * | Traits refactoringDmitry Stogov2012-12-2518-429/+341
| | |
* | | Implement Generator::throw() methodNikita Popov2012-12-246-5/+158
| | | | | | | | | | | | | | | | | | | | | Generator::throw($exception) throws an exception into the generator. The exception is thrown at the current point of suspension within the generator. It basically behaves as if the current yield statement were replaced with a throw statement and the generator subsequently resumed.
* | | Fix crash when last yielded value is a closureNikita Popov2012-12-212-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If zend_generator_close is called from within zend_generator_resume (e.g. due to a return statement) then all the EGs will still be using the values from the generator. That's why the stack frame has to be the last thing that is dtored, otherwise some other dtor that is using EG(current_execute_data) might access the already freed memory segment. This was the case with the closure dtor. The fix is to move the dtors for key and value to the start of the handler. This way the stack frame is the last thing that is freed.
* | | Fix bug #63822: Crash when using closures with ArrayAccessNikita Popov2012-12-212-10/+6
| | | | | | | | | | | | | | | op_array->T was used after the closure's op_array was already freed. This just swaps the freeing order.
* | | Do not add a ref to EX(object) on generator cloneNikita Popov2012-12-202-5/+21
| | | | | | | | | | | | | | | If a ref has to be added it will be already added while walking the call slots.
* | | Add missing zend_do_free callNikita Popov2012-12-191-1/+1
| | | | | | | | | | | | | | | This is a followup to d53f1bf8ab. When the yield *statement* is used its return value still needs to be freed.
* | | Fix leak when generator ignores sent valueNikita Popov2012-12-185-61/+47
| | | | | | | | | | | | | | | | | | | | | When the return value of yield wasn't used it was leaked. This is fixed by using a TMP_VAR return value instead of VAR. TMP_VARs are automatically freed when they aren't used.
* | | Fix warning of no return in non-void functionXinchen Hui2012-12-141-0/+1
| | |
* | | Fixed warning of no return in non-void funcitonXinchen Hui2012-12-143-0/+18
| | |
* | | Add test for bug #63741Xinchen Hui2012-12-141-0/+50
| | |
* | | Fixed uninitialized EX(call)->called_scopeDmitry Stogov2012-12-142-0/+14
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2012-12-132-15/+92
|\ \ \ | |/ /
| * | 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
| | |
* | | Removed unreachable codeDmitry Stogov2012-12-132-63/+0
| | |
* | | Removed unnecessary checksDmitry Stogov2012-12-134-10/+14
| | |
* | | Removed redundand checks from release buildDmitry Stogov2012-12-134-40/+11
| | |
* | | An exception thrown in try or catch block is disacarded by return statement ↵Dmitry Stogov2012-12-1310-55/+95
| | | | | | | | | | | | in finally block.
* | | Restored proper generators behaviour in conjunction with "finally". (Nikita)Dmitry Stogov2012-12-1213-102/+171
| | |
* | | - generators API exported for extensionsDmitry Stogov2012-12-114-36/+60
| | | | | | | | | | | | - improved RETURN sequence to avoid redundant check if op_array is a generator
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-12-103-1/+5
|\ \ \ | |/ /
| * | 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