Dmitry Stogov
326f896739
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
Conflicts:
NEWS
2013-01-09 11:32:40 +04:00
Dmitry Stogov
f9e8678dd3
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
2013-01-09 11:30:50 +04:00
Xinchen Hui
c4f2a20f15
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-04 11:05:53 +08:00
Xinchen Hui
aff5d084a5
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-04 11:03:52 +08:00
Xinchen Hui
c3e6de2227
Fixed bug #63899 (Use after scope error in zend_compile)
2013-01-04 11:02:21 +08:00
Stanislav Malyshev
80a9a80a52
Merge branch 'PHP-5.4' into PHP-5.5
...
* 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
2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab
Bug #43177 : If an eval() has a parse error, the overall exit status and 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.
2013-01-01 21:18:59 -08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
831fbcf385
Happy New Year
2013-01-01 16:23:31 +08:00
Pierrick Charron
8228597ecc
Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
...
T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c
Bugfix by Nikita for bug #60097
2012-12-29 23:11:37 -05:00
Pierrick Charron
663434cd76
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-26 10:17:37 -05:00
Pierrick Charron
b35ffdeae1
Revert "Remove a useless memory write in zend_llist_del_element"
...
This reverts commit fad960a404
as
required by Stas and Christopher
2012-12-26 10:13:56 -05:00
Pierrick Charron
5a97c30efe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:59:20 -05:00
Pierrick Charron
c12ab5c306
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:57:21 -05:00
Pierrick Charron
fad960a404
Remove a useless memory write in zend_llist_del_element
...
The zend_llist_element *next pointer is not necessary and removing
it will also remove a write on memory
2012-12-25 20:45:24 -05:00
Dmitry Stogov
8e6bf9e5e5
spelling
2012-12-25 16:23:52 +04:00
Dmitry Stogov
7625a3b3b4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
spelling
2012-12-25 16:22:07 +04:00
Dmitry Stogov
7e2629635b
spelling
2012-12-25 16:21:25 +04:00
Dmitry Stogov
016f3c8610
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed ZTS build
2012-12-25 13:39:02 +04:00
Dmitry Stogov
f0b459b7c4
Fixed ZTS build
2012-12-25 13:38:14 +04:00
Dmitry Stogov
bc0425c025
Removed deprecated fields
2012-12-25 10:47:43 +04:00
Dmitry Stogov
b8c719c068
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Traits refactoring
2012-12-25 10:33:01 +04:00
Dmitry Stogov
3f8c729e69
Traits refactoring
2012-12-25 10:23:08 +04:00
Nikita Popov
be7b0bc3ec
Implement Generator::throw() method
...
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.
2012-12-24 00:27:55 +01:00
Nikita Popov
14f133036c
Fix crash when last yielded value is a closure
...
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.
2012-12-21 17:28:20 +01:00
Nikita Popov
ffb848b275
Fix bug #63822 : Crash when using closures with ArrayAccess
...
op_array->T was used after the closure's op_array was already freed. This just
swaps the freeing order.
2012-12-21 01:56:37 +01:00
Nikita Popov
3e78c6ad25
Do not add a ref to EX(object) on generator clone
...
If a ref has to be added it will be already added while walking the call
slots.
2012-12-20 20:33:18 +01:00
Nikita Popov
2768315856
Add missing zend_do_free call
...
This is a followup to d53f1bf8ab
. When the yield *statement* is used its
return value still needs to be freed.
2012-12-19 15:21:34 +01:00
Nikita Popov
d53f1bf8ab
Fix leak when generator ignores sent value
...
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.
2012-12-18 21:39:02 +01:00
Xinchen Hui
a73a6be764
Fix warning of no return in non-void function
2012-12-14 17:26:42 +08:00
Xinchen Hui
9fb5cfdeb1
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
Xinchen Hui
359d91a807
Add test for bug #63741
2012-12-14 16:52:56 +08:00
Dmitry Stogov
e65b966aac
Fixed uninitialized EX(call)->called_scope
2012-12-14 12:10:29 +04:00
Johannes Schlüter
2098cc7e9d
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 22:45:47 +01:00
Johannes Schlüter
ef37055c34
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 22:40:23 +01:00
Johannes Schlüter
a11606b18f
Fix Bug #63762 Sigsegv when Exception::$trace is changed by user
2012-12-13 22:39:35 +01:00
Dmitry Stogov
d5c2da5756
Removed unreachable code
2012-12-13 17:51:04 +04:00
Dmitry Stogov
438cd86378
Removed unnecessary checks
2012-12-13 17:29:30 +04:00
Dmitry Stogov
ff1e1d7a8e
Removed redundand checks from release build
2012-12-13 14:46:44 +04:00
Dmitry Stogov
6b0b4bf8eb
An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 02:48:51 +04:00
Dmitry Stogov
9c96fe52d9
Restored proper generators behaviour in conjunction with "finally". (Nikita)
2012-12-12 17:47:55 +04:00
Dmitry Stogov
a9a5f7aca6
- generators API exported for extensions
...
- improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 17:25:32 +04:00
Xinchen Hui
70b65f3100
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-10 20:30:39 +08:00
Xinchen Hui
3d86e6d881
Fixed bug #63726 (Memleak with static properties and internal/user classes)
...
No test scripts provided (will try to find one)
2012-12-10 20:29:51 +08:00
Xinchen Hui
ad553a7af2
Fixed bug #63726 (Memleak with static properties and internal/user classes)
2012-12-10 20:28:27 +08:00
Dmitry Stogov
e3b2a5cf74
Generatirs are going to be used less than regular functions
2012-12-06 13:14:31 +04:00
Sebastian Bergmann
8ca4288fd2
Leftover: Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.
2012-12-06 09:43:27 +01:00
Sebastian Bergmann
eab14993fe
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.
2012-12-06 09:28:35 +01:00
Dmitry Stogov
27528b601f
Fixed comments
2012-12-05 16:02:47 +04:00