Xinchen Hui
b28277db94
Cleanup exception handling after zend_fetch_class_by_name
2016-09-30 16:00:14 +08:00
Xinchen Hui
f211614ba7
Use smart branch
2016-09-30 13:19:11 +08:00
Dmitry Stogov
53c0a04185
zval_dtor_func_for_ptr() -> zval_dtor_func()
2016-09-29 10:59:54 +03:00
Dmitry Stogov
8863ca76e6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
2016-09-29 10:57:09 +03:00
Dmitry Stogov
e7f4355d9b
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
2016-09-29 10:56:01 +03:00
Nikita Popov
56a7646ab2
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-28 23:22:48 +02:00
Nikita Popov
e520b9e127
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-28 23:22:11 +02:00
Nikita Popov
1f5412982c
Handle resource keys in constexpr arrays
2016-09-28 23:11:02 +02:00
Nikita Popov
40b8105cca
Fix the constant array case as well
2016-09-28 23:05:21 +02:00
Nikita Popov
97066792b7
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-28 22:38:47 +02:00
Nikita Popov
437942d972
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-28 22:36:58 +02:00
Nikita Popov
99bf19c177
Check next_index_insert failure in ADD_ARRAY_ELEMENT
2016-09-28 22:35:27 +02:00
Nikita Popov
19f1ff5ad0
Combine code for keyed/unkeyed list()
2016-09-28 21:43:48 +02:00
Nikita Popov
6f9e5684a1
Fix segfault when empty entry in keyed array assignment
2016-09-28 21:43:48 +02:00
Anatol Belski
22a3d55e9a
fix exports which are now referenced by phpdbg
...
(cherry picked from commit cd0f1c8a5e
)
2016-09-28 21:29:53 +02:00
Nikita Popov
bf907b9961
Revert ReflectionType::__toString() behavior + deprecate
2016-09-28 19:21:51 +02:00
Bob Weinand
e5d75d7268
Add phpdbg generator command
2016-09-28 13:26:08 +02:00
Nikita Popov
21f0be4792
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-27 19:48:50 +02:00
Nikita Popov
b7cbaa7f43
Fix bug #73181
2016-09-27 19:47:48 +02:00
Anatol Belski
4e3746380a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73172 parse error: Invalid numeric literal
2016-09-26 18:49:40 +02:00
Anatol Belski
39e5991705
Fixed bug #73172 parse error: Invalid numeric literal
2016-09-26 18:47:30 +02:00
Dmitry Stogov
6be2e79c2c
On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table.
2016-09-26 16:16:07 +03:00
Dmitry Stogov
bca7f02933
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73156 (segfault on undefined function)
2016-09-26 14:17:27 +03:00
Dmitry Stogov
d279118422
Fixed bug #73156 (segfault on undefined function)
2016-09-26 14:14:57 +03:00
Nikita Popov
bd893061d6
Use SEND_USER for CONST|TMP as well
...
Otherwise we're missing the "expected to be a reference, value
given" warning that appears for ordinary calls to call_user_func().
Also update an UPGRADING note with recent changes wrt
call_user_func().
2016-09-25 12:39:23 +02:00
Nikita Popov
c7651c2396
Fix a couple of ASSIGN_DIM/OBJ inference bugs
...
Account for possible null return values better.
2016-09-24 22:43:27 +02:00
Christoph M. Becker
75a1384ebf
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-24 18:18:34 +02:00
Christoph M. Becker
bc22582cf7
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-24 18:05:21 +02:00
Christoph M. Becker
c596b02a5b
Merge branch 'pull-request/2120' into PHP-5.6
2016-09-24 17:52:15 +02:00
Nikita Popov
453102b4a0
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-24 13:22:00 +02:00
Nikita Popov
8831a12da1
Fixed bug #73163
2016-09-24 13:18:43 +02:00
John Boehr
68e602ff0a
Fix bug #69579
2016-09-22 12:38:07 +02:00
Nikita Popov
7cd2494bb8
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-22 12:34:55 +02:00
John Boehr
8e313becf4
Fix bug #69579
2016-09-22 12:32:37 +02:00
Dmitry Stogov
64a8048c53
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
2016-09-20 12:34:58 +03:00
Dmitry Stogov
3c16384ea2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
2016-09-20 12:34:40 +03:00
Dmitry Stogov
4dd70b6e2f
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
2016-09-20 12:29:57 +03:00
TAKEKOSHI Akishige
2efb131210
when needle is short, Sunday algorithm is slower than glibc memchr()
2016-09-18 16:35:09 +08:00
Nikita Popov
896814e139
Make zval_ptr_dtor / _zval_dtor_func more robust
...
In particular, allow arrays with refcount>1, like we already allow
for all other types. _zval_dtor_func is now the same as
_zval_dtor_func_for_ptr with an extra refcount decrement check at
the start. At this point we might as well drop it...
Cherry-pick of ded69ee6e6
from
PHP-7.1.
2016-09-17 22:33:41 +02:00
Nikita Popov
cab7bc7e07
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-16 21:06:11 +02:00
Michael Orlitzky
0e76cafaf1
Disable add/sub asm for gcc 4.9 pic/pie builds
2016-09-16 21:06:02 +02:00
Anatol Belski
8fd0e0285f
missed semicolon
2016-09-13 10:50:44 +02:00
Anatol Belski
363c2524dd
fix C89 conformity
2016-09-13 10:43:51 +02:00
Stanislav Malyshev
6a7cc8ff85
Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
2016-09-12 21:04:23 -07:00
Stanislav Malyshev
19866fb76c
Fix various int size overflows.
...
Add function for detection of string zvals with length that does not fit
INT_MAX.
2016-09-12 21:04:23 -07:00
Xinchen Hui
a339523fe5
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73067 (__debugInfo crashes when throwing an exception)
2016-09-13 10:59:09 +08:00
Xinchen Hui
2d8ab51576
Fixed bug #73067 (__debugInfo crashes when throwing an exception)
2016-09-13 10:58:57 +08:00
Andrea Faulds
fc5497cb92
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-11 22:46:20 +01:00
Andrea Faulds
d690014bf3
Remove zpp fallback code (always use Fast ZPP)
...
Squashed commit of the following:
commit 3e27fbb3d2
Author: Andrea Faulds <ajf@ajf.me>
Date: Sun Sep 11 19:14:37 2016 +0100
Keep dummy FAST_ZPP macro for compatibility
commit 8a7cfd00de
Author: Andrea Faulds <ajf@ajf.me>
Date: Mon Sep 5 22:36:03 2016 +0100
Remove FAST_ZPP macro and plain zpp fallback code
2016-09-11 22:44:46 +01:00
Nikita Popov
30af80610e
Compile intval() etc to casts
2016-09-09 15:45:46 +02:00