1
0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Commit Graph

40664 Commits

Author SHA1 Message Date
Nikita Popov
949aaea66e Don't insert duplicate predecessors
Otherwise we'll get corrupt phis
2016-01-24 23:03:57 +01:00
Nikita Popov
cf6aa46dbd Fix SSA for ZEND_YIELD
Yield-by-ref defs a ref var, yield-by-var only defs an rc1/rcn var
if rc inference is used.

Also move BIND_LEXICAL where it belongs in DFG construction.
2016-01-24 23:03:50 +01:00
Xinchen Hui
6d674b3d91 Merge branch 'PHP-7.0' 2016-01-24 03:57:17 -08:00
Xinchen Hui
d74cc3afcf Fixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant) 2016-01-24 03:56:47 -08:00
Xinchen Hui
ae122bf7ad Fixed warning of incompatible pointer 2016-01-23 22:49:15 -08:00
Eddie Kohler
104876dd8e json_encode: Escape U+2028 and U+2029 more often.
These characters are illegal in Javascript, so leaving them unescaped
is risky. The default encoder ($flags = 0) is fine, but the encoder
with JSON_UNESCAPED_UNICODE flag is not.

In case anyone wants the ability to leave these characters unescaped,
provide JSON_UNESCAPED_LINE_TERMINATORS.
2016-01-22 19:40:58 +00:00
Dmitry Stogov
9b854ebab4 More accurate handling of isset() and unset() 2016-01-22 13:32:20 +03:00
Dmitry Stogov
79071fe227 Added optimization constraint (don't optimize result of NEW, because constructor may throw exception) 2016-01-22 13:30:34 +03:00
Nikita Popov
b1e4883d26 Don't print try-catch offset for FAST_RET w/o ev 2016-01-21 21:53:13 +01:00
Nikita Popov
9b57e07298 Consolidate op1/op2 vm flags 2016-01-21 21:15:05 +01:00
Andrey Hristov
64cb71cc8b Add missing macro 2016-01-21 12:59:23 +01:00
Remi Collet
544f8a0794 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
  fix ReflectionClass::__toString doc block omitted
2016-01-20 13:11:13 +01:00
Remi Collet
e58cf4f996 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
2016-01-20 13:10:56 +01:00
Remi Collet
3c8f287d58 Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message)
Fix skip message to work
2016-01-20 13:08:58 +01:00
Joe Watkins
7d100866ec Merge branch 'master' of https://github.com/php/php-src 2016-01-20 10:55:09 +00:00
Joe Watkins
11cf826b89 fix ReflectionClass::__toString doc block omitted 2016-01-20 10:54:55 +00:00
Joe Watkins
98164714ea Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-01-20 10:52:57 +00:00
Joe Watkins
b899656eb0 fix ReflectionClass::__toString doc block omitted 2016-01-20 10:52:27 +00:00
Anatol Belski
d284072f78 Merge branch 'PHP-7.0'
* PHP-7.0:
  improve fix for bug #71201
  improve fix for bug #71201
2016-01-20 09:46:58 +01:00
Anatol Belski
4b97237374 improve fix for bug #71201 2016-01-20 09:46:09 +01:00
Anatol Belski
508d1dae25 improve fix for bug #71201 2016-01-20 09:44:28 +01:00
Nikita Popov
dcf3db6ac8 Mark isset($$var) as INDIRECT_VAR_ACCESS 2016-01-19 22:26:32 +01:00
Nikita Popov
5662d73528 Add support for Pi type constraints
Supports TYPE_CHECK and IS_IDENTICAL for now.
2016-01-19 22:09:29 +01:00
Dmitry Stogov
a8900b5636 Typo (ASSESS->ACCESS) 2016-01-19 15:54:44 +03:00
Dmitry Stogov
a2ff3a46a4 Use ZEND_FUNC_INDIRECT_VAR_ASSESS instead of ZEND_FUNC_TOO_DYNAMIC. Handle function with exceptions handlers and generators separately. 2016-01-19 15:33:08 +03:00
Anatol Belski
29176aaa01 vc doesn't support #warning 2016-01-19 12:14:59 +01:00
Anatol Belski
a50120c416 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default
2016-01-18 18:24:42 +01:00
Anatol Belski
2749bf4576 fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default 2016-01-18 18:23:07 +01:00
Anatol Belski
5af056a662 Merge branch 'PHP-7.0'
* PHP-7.0:
  fork test
  fix test
  fork test
  fork test for win32
  fork test
2016-01-18 17:02:58 +01:00
Anatol Belski
71dbad172f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fork test
  fix test
  fork test
  fork test for win32
  fork test
2016-01-18 17:02:23 +01:00
Anatol Belski
fa0dd6006d fork test 2016-01-18 16:59:17 +01:00
Anatol Belski
adf0be7680 fork test 2016-01-18 16:45:35 +01:00
Anatol Belski
f0e2fe8e75 fork test for win32 2016-01-18 16:37:04 +01:00
Anatol Belski
f0b02f2351 fork test 2016-01-18 16:34:20 +01:00
Yasuo Ohgaki
2dce532a90 Merge branch 'PHP-7.0'
* PHP-7.0:
  Use SUCCESS/FAILURE
2016-01-18 13:35:43 +09:00
Yasuo Ohgaki
d7fc3be99e Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Use SUCCESS/FAILURE
2016-01-18 13:35:01 +09:00
Yasuo Ohgaki
ee1dd4949a Use SUCCESS/FAILURE 2016-01-18 13:33:47 +09:00
Yasuo Ohgaki
05e87fa418 Fixed bug #71070 Custom session handler write method returns false, warning message misleading
This is commited to master only.
If you have better error message suggestion, feel free to improve it.
2016-01-18 12:03:41 +09:00
Yasuo Ohgaki
f9c595f3c0 Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test 2016-01-18 10:54:07 +09:00
Yasuo Ohgaki
3a8c4a0084 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:52:48 +09:00
Yasuo Ohgaki
7554478a4c Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:52:11 +09:00
Yasuo Ohgaki
dc23f1f38f Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test 2016-01-18 10:51:29 +09:00
Yasuo Ohgaki
e4f40a84c7 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug 71397 (mb_send_mail segmentation fault)
2016-01-18 09:42:11 +09:00
Yasuo Ohgaki
5b5524a332 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71397 (mb_send_mail segmentation fault)
2016-01-18 09:23:42 +09:00
Yasuo Ohgaki
ff10dceff8 Fixed bug #71397 (mb_send_mail segmentation fault) 2016-01-18 09:23:20 +09:00
Tim Düsterhus
e585696a0b Fixed bug 71397 (mb_send_mail segmentation fault) 2016-01-17 15:30:09 +01:00
Yasuo Ohgaki
1277846228 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71394 (session_regenerate_id() must close opened session on errors)
2016-01-17 17:12:49 +09:00
Yasuo Ohgaki
3b2d98a625 Fixed bug #71394 (session_regenerate_id() must close opened session on errors) 2016-01-17 17:11:47 +09:00
Yasuo Ohgaki
00eaaca18a Remove unnecessary warning by warning reorder. 2016-01-17 17:08:44 +09:00
Yasuo Ohgaki
82a0c47712 Merge branch 'PHP-7.0'
* PHP-7.0:
  Remove unnecessary warning by warning reorder.
2016-01-17 16:21:48 +09:00