Anatol Belski
dd604015be
rename publicly exposed symbol to avoid name conflicts
...
(cherry picked from commit 730288ae41
)
2016-10-14 02:08:14 +02:00
Anatol Belski
ee42529750
Revert "export symbol missing by phpdbg"
...
This reverts commit 611ab7fe5b
.
Overseen strpprintf is there
(cherry picked from commit 3104882cf8
)
2016-10-14 02:01:08 +02:00
Stanislav Malyshev
0362d61ab7
Fix potential overflows in php_pcre_replace_impl
...
(cherry picked from commit 9c50ba42d6
)
2016-10-14 01:57:55 +02:00
Anatol Belski
b4ddf4e575
fix another mistake
...
(cherry picked from commit bec0121733
)
2016-10-14 01:56:31 +02:00
Nikita Popov
0e4c173349
Merge branch 'PHP-7.0' into PHP-7.1
...
(cherry picked from commit 26964ccea0
)
2016-10-14 01:52:17 +02:00
Anatol Belski
4e338817d1
export symbol missing by phpdbg
...
(cherry picked from commit 611ab7fe5b
)
2016-10-14 01:51:21 +02:00
Anatol Belski
2c38f70a94
fix wrong merge
...
(cherry picked from commit 821a230f29
)
2016-10-14 01:49:39 +02:00
Anatol Belski
a8a11b669d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73190 : memcpy negative parameter _bc_new_num_ex
(cherry picked from commit af1bf873fe
)
2016-10-14 01:46:18 +02:00
Anatol Belski
a6715786a7
finish 7.1 port
...
(cherry picked from commit f1fff032fc
)
2016-10-14 01:44:31 +02:00
Stanislav Malyshev
54003ab663
Fix bug #73147 : Use After Free in PHP7 unserialize()
...
(cherry picked from commit 0e6fe3a4c9
)
(cherry picked from commit f42cbd749c
)
2016-10-14 01:44:16 +02:00
Xinchen Hui
c9274d20b7
Fixed bug #73288 (Segfault in __clone > Exception.toString > __get)
...
Actually this is caused by optimization(opcache)
(cherry picked from commit d19898b298
)
2016-10-14 01:35:39 +02:00
Nikita Popov
f8a6df4706
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-08 17:00:56 +02:00
Nikita Popov
2a75f5026a
Fix bug #66773 , #66862
...
This a partial backport of 8754b19
. It
a) fixes the class/function/constant import table confusion in the
namespaced case, and
b) restricts conflict checks to a single file based on a filename
pointer comparison.
It does not fix the issues with filename reuse (e.g. due to eval)
and late-bound classes. This part of the change requires globals
changes.
2016-10-08 17:00:27 +02:00
Nikita Popov
02ba9d71ab
Unwrap reference returns in cufa etc
2016-09-30 22:10:01 +02:00
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