Nikita Nefedov
19759a5602
Fix RECV opcode to handle all kinds of exceptions
...
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result Notice error from failed type coercion
2016-04-20 08:40:44 -07:00
Dmitry Stogov
e46be0cd19
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Prevent usage in GC after free.
2016-04-19 01:37:24 +03:00
Dmitry Stogov
ffc697ac27
Prevent usage in GC after free.
2016-04-19 01:31:49 +03:00
Nikita Popov
73958ca62d
Fix SEND_USER as well
...
Missed copy&paste code here
2016-04-18 22:45:38 +02:00
Nikita Popov
a8792158bd
Fix SEND_ARRAY+PREFER_REF SHM corruption
...
Make the behavior consistent between namespaced and not and with
PHP 5.6.
2016-04-18 18:26:20 +02:00
Xinchen Hui
aa9f8e695c
combine conditions
2016-04-18 19:13:54 +08:00
Nikita Popov
d1a38743a5
Fix SEND_UNPACK array separation
...
Separating only immutable arrays is not enough.
2016-04-16 22:33:23 +02:00
Bob Weinand
15d1d4f45b
Fixed bug #72038 (Function calls with values to a by-ref parameter don't always throw a notice)
2016-04-16 20:36:19 +02:00
Nikita Popov
4e585eb429
Fix ZEND_SEPARATE for by-val func returning ref zval
2016-04-12 14:44:29 +02:00
Nikita Popov
6a2eee520a
Drop unnecessary ZEND_SEPARATE code
...
The following write ops will separate if necessary.
2016-04-12 14:44:29 +02:00
Remi Collet
d62ab27042
fix skipif
2016-04-12 13:46:06 +02:00
Joe Watkins
c0b821d2e9
handle dummy frame
2016-04-11 13:24:37 +01:00
Nikita Popov
aad4ecebf8
Fixed bug #71980
2016-04-07 12:29:59 +02:00
Nikita Popov
5ab950cb2c
Remove __halt_compiler from semi-reserved tokens
...
token_get_all() is not capable of dealing with this one correctly.
2016-04-07 05:52:32 +02:00
Dmitry Stogov
088f55ae74
Fixed build
2016-04-07 00:59:21 +03:00
Dmitry Stogov
e9d65160e8
Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
2016-04-06 17:17:10 +03:00
Joe Watkins
9a38b2dbce
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-04-03 12:41:23 +01:00
Joe Watkins
14e4c610e9
Fix #69537 : __debugInfo with empty string for key gives error
2016-04-03 12:40:29 +01:00
Joe Watkins
91c10662c8
fix #69537 : __debugInfo with empty string for key gives error
2016-04-03 12:38:25 +01:00
Xinchen Hui
5b1bb41c0b
Fixed bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1' failed)
2016-04-01 22:27:29 +08:00
Nikita Popov
f95679885f
Fix __invoke comparison in closure_get_method
...
It compared against the wrong variable. Fixed this by getting rid
of lc_name entirely and use equals_literal_ci instead.
2016-03-30 18:32:00 +02:00
Nikita Popov
ed06d130f7
Fixed bug #71922
2016-03-29 19:29:19 +02:00
Joe Watkins
5074fd9c7c
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-03-29 11:34:58 +01:00
Joe Watkins
d12ed0c7fa
remove unused param
2016-03-29 11:34:18 +01:00
Xinchen Hui
256593abcf
Update tests
2016-03-29 17:52:58 +08:00
Xinchen Hui
2e6d70787c
Fixed bug #71914 (Reference is lost in "switch")
2016-03-29 17:14:36 +08:00
Joe Watkins
dd70c39556
fix bug #71428 : Validation type inheritance with = NULL
2016-03-29 09:57:51 +01:00
Joe Watkins
3f56dfe866
Bug #71428 work ... hopefully, fix drupal 8
2016-03-29 09:36:08 +01:00
Joe Watkins
ee9a78a033
work on #71428
2016-03-28 11:54:25 +01:00
Joe Watkins
32df2210d7
my commits are bad, and I feel bad (test for bug #71414 )
2016-03-26 23:59:46 +00:00
Joe Watkins
4327370d13
fix #71414 (Interface method override inherited method and implemented in a trait causes fatal error)
2016-03-26 23:47:31 +00:00
Joe Watkins
1a75cd29a2
add test for bug
2016-03-26 11:15:08 +00:00
Joe Watkins
373da7aa6f
fix standard object handler for properties when type == BP_VAR_IS
2016-03-26 11:15:08 +00:00
Rasmus Lerdorf
1efcdaf092
Disable huge pages in the Zend allocator by default
...
As per the discussion on internals, this is an expert feature
that needs special system-level configuration and care.
2016-03-22 08:04:53 -07:00
Nikita Popov
dc842bbf8d
Fixed bug #71871
2016-03-21 22:49:18 +01:00
Xinchen Hui
d26ca89402
array_dup should not copy the nApplyCount
2016-03-21 19:19:05 +08:00
Xinchen Hui
9712a974be
Also protects object to array cast
2016-03-21 19:12:50 +08:00
Jakub Zelenka
7e069daa89
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-20 15:56:27 +00:00
Nikita Popov
a175aa9dca
Fixed bug #71731
...
The read_dimension() handler in BP_VAR_IS mode will now call
offsetExists() before caling offsetGet(). This has always been a
problem, however recently the issue has been exacerbated, because
the null-coalesce operator ?? makes it visible for non-nested
array accesses.
Also fixes #69659 .
2016-03-20 13:35:00 +01:00
Nikita Popov
1f6d27d3d2
Fix use of UNDEF instead of NULL in read_dimension
2016-03-20 13:33:17 +01:00
Xinchen Hui
9564998e49
Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing)
2016-03-20 04:52:57 -07:00
Nikita Popov
fd95555107
Fix ZEND_DEBUG condition
2016-03-18 19:31:34 +01:00
Dmitry Stogov
945a661912
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
2016-03-17 22:43:42 +03:00
Xinchen Hui
93499bfd8a
Fixed test & ZEND_BOOL should result TMP_VAR
2016-03-17 07:55:25 -07:00
Xinchen Hui
910e6dc6b8
Fixed for master
2016-03-17 21:10:08 +08:00
Xinchen Hui
fe1a3fc08b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71841 (EG(error_zval) is not handled well)
Fixed bug #71840 (Unserialize accepts wrongly data)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/standard/var_unserializer.c
2016-03-17 15:22:44 +08:00
Xinchen Hui
5546f8be56
Fixed bug #71841 (EG(error_zval) is not handled well)
2016-03-17 15:16:47 +08:00
Nikita Popov
02743f43c2
Fixed bug #71806
2016-03-11 22:45:38 +01:00
Grigorii Sokolik
ccc5150f15
Fix bug #71767
2016-03-11 22:27:48 +01:00
Anatol Belski
741bfe3932
fix build with clang on Winodws
2016-03-10 15:30:20 +01:00