Xinchen Hui
bcb223a626
Merge branch 'PHP-5.5'
2013-04-11 14:29:51 +08:00
Xinchen Hui
a5cfe57e08
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-11 14:29:09 +08:00
Xinchen Hui
ba292b037f
Fixed bug (Wrong ce cached)
2013-04-11 14:28:42 +08:00
Xinchen Hui
c2afd2765b
Merge branch 'PHP-5.5'
2013-03-26 12:03:37 +08:00
Xinchen Hui
ed31582301
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 12:02:48 +08:00
Xinchen Hui
5e9377ebd5
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 11:44:57 +08:00
Dmitry Stogov
a4c386f32c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:48:13 +04:00
Dmitry Stogov
96e5f5eb05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-03-25 15:47:45 +04:00
Dmitry Stogov
e9f996c00d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-03-25 15:23:49 +04:00
Dmitry Stogov
c4686b4de9
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:07:27 +04:00
Dmitry Stogov
22b0f5d829
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed redundand code
2013-03-14 14:22:51 +04:00
Dmitry Stogov
dd1c358d1b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix the fix
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Forgot to remove some now unused variables
Add support for non-scalar Iterator keys in foreach
fixed headers order
- Updated to version 2013.2 (2013b)
fixed the test
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
Disable zend_always_inline in debug build
2013-03-14 14:19:41 +04:00
Dmitry Stogov
d77c865aff
Removed redundand code
2013-03-13 17:51:10 +04:00
Nikita Popov
81623d3a60
Merge branch 'PHP-5.5'
...
Conflicts:
UPGRADING
UPGRADING.INTERNALS
2013-03-12 17:29:54 +01:00
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Stanislav Malyshev
4c293bfe91
Merge branch 'PHP-5.5'
...
* PHP-5.5:
news for bug #49348
fix tests
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:57:52 -08:00
Stanislav Malyshev
0c6d903ce7
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-18 20:56:02 -08:00
Xinchen Hui
92046b7ef1
Merge branch 'PHP-5.5'
2013-02-16 22:25:37 +08:00
Xinchen Hui
75742d57eb
Exceptions triggered by undefined variable should be handled before FATAL error
...
this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
Xinchen Hui
7fb07acf98
Merge branch 'PHP-5.5'
2013-02-07 23:46:15 +08:00
Xinchen Hui
290509755a
Fixed bug #64135 (Exceptions from set_error_handler are not always propagated)
2013-02-07 23:44:46 +08:00
Gustavo Lopes
ddc98aa814
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:26:15 +01:00
Gustavo Lopes
fc7b054c2d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:24:50 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Lars Strojny
b1ddfcbee3
Merge branch 'PHP-5.5'
2013-01-19 01:01:39 +01:00
Lars Strojny
8991ed016f
Class Name Resolution As Scalar Via "class" Keyword
2013-01-19 01:00:47 +01:00
Xinchen Hui
f6260b36dd
Merge branch 'PHP-5.5'
2013-01-14 16:24:26 +08:00
Xinchen Hui
62059c16ee
Fixed bug #63980 (object members get trimmed by zero bytes)
2013-01-14 16:23:22 +08:00
Xinchen Hui
642721b38a
Merge branch 'PHP-5.5'
2013-01-01 16:39:03 +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
Nikita Popov
4509016309
Merge branch 'PHP-5.5'
2012-12-21 01:58:29 +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
5f7c478d53
Merge branch 'PHP-5.5'
2012-12-18 21:41:55 +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
210d428f99
ixed bug that exception won't be catched
...
Related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:34:47 +08:00
Xinchen Hui
d3ec9ceb25
Revert "Fixed bug that exception won't be catched"
...
This reverts commit 28db07a0e3
.
Unexpected vm kind change
2012-12-18 15:27:54 +08:00
Xinchen Hui
28db07a0e3
Fixed bug that exception won't be catched
...
related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:20:58 +08:00
Xinchen Hui
9fb5cfdeb1
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
Dmitry Stogov
e65b966aac
Fixed uninitialized EX(call)->called_scope
2012-12-14 12:10:29 +04: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
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
Dmitry Stogov
e3b2a5cf74
Generatirs are going to be used less than regular functions
2012-12-06 13:14:31 +04:00
Dmitry Stogov
fa30e4754b
Slight performance improvement
2012-12-05 13:23:37 +04:00
Dmitry Stogov
7651d64556
Optimized access to temporary and compiled VM variables
2012-12-04 10:14:39 +04:00