Commit Graph

93864 Commits

Author SHA1 Message Date
Nikita Popov
7078627d22 Fix leaks due to UNUSED CE fetch 2015-12-14 17:31:37 +01:00
Rasmus Lerdorf
a63f33b282 Support uwsgi sapi in opcache 2015-12-14 06:11:00 -08:00
Rasmus Lerdorf
56bf10f0bd Support uwsgi sapi in opcache 2015-12-14 06:10:26 -08:00
Rasmus Lerdorf
9a31d70845 Support uwsgi sapi in opcache 2015-12-14 06:09:17 -08:00
Nikita Popov
0919178963 Add result op for ASSERT_CHECK to fix SSA
Otherwise one source of the phi node at the join point will be
borked.

I'm marking the ASSERT_CHECK result as unused in pass2, which is
a bit ugly.
2015-12-14 12:31:00 +01:00
Xinchen Hui
732fe984f2 Merge branch 'master' of git.php.net:/php-src 2015-12-14 17:15:03 +08:00
Xinchen Hui
e670374053 Typo 2015-12-14 17:14:41 +08:00
Anatol Belski
0ec58fa32b Merge branch 'PHP-7.0'
* PHP-7.0:
  Refactor password_hash to use random_bytes internally to generate salts
2015-12-14 09:15:36 +01:00
Anthony Ferrara
02e85045dc Refactor password_hash to use random_bytes internally to generate salts 2015-12-14 09:05:16 +01:00
Xinchen Hui
9b148d31d3 Fixed bug #71100 (long2ip() doesn't accept integers in strict mode) 2015-12-14 14:55:44 +08:00
Xinchen Hui
e0cafcf8a7 Merge branch 'PHP-7.0' 2015-12-14 10:54:30 +08:00
Xinchen Hui
6a35e3b383 Added NEWS 2015-12-14 10:54:10 +08:00
Nikita Popov
e8864c39e8 Don't check non-CVs for UNDEF in BOOL(_NOT) 2015-12-14 00:32:40 +01:00
Nikita Popov
d5597fa01f Merge branch 'PHP-7.0' 2015-12-14 00:29:57 +01:00
Nikita Popov
7dc5bc5063 Do not swap operands in array addition
As we support constant array operands nowadays, the original check
didn't work anymore.
2015-12-14 00:29:05 +01:00
Xinchen Hui
ad51c709c3 Merge branch 'PHP-7.0' 2015-12-13 05:06:22 -08:00
Xinchen Hui
07b33992a2 Fixed bug #71109 (ZEND_MOD_CONFLICTS("xdebug") doesn't work) 2015-12-13 05:06:08 -08:00
Xinchen Hui
4a732e97b4 Merge branch 'optimize-strtolower' of https://github.com/hnw/php-src 2015-12-12 22:57:44 -08:00
Xinchen Hui
145b68c834 Merge branch 'PHP-7.0' 2015-12-12 22:52:51 -08:00
Xinchen Hui
4171a8f6c6 Internal function argumensts cleanup (strict_types) 2015-12-12 22:52:37 -08:00
Xinchen Hui
daefe53869 Merge branch 'PHP-7.0' 2015-12-12 22:38:15 -08:00
Xinchen Hui
a9026070b6 Fixed test 2015-12-12 22:37:50 -08:00
Yoshio HANAWA
fa78da9901 Optimize strtolower()/strtoupper() 2015-12-13 14:22:50 +09:00
Xinchen Hui
ac693205b1 Merge branch 'PHP-7.0' 2015-12-12 18:45:39 -08:00
Xinchen Hui
b101a6bbd4 Use format string 2015-12-12 18:45:11 -08:00
Nikita Popov
2589dd121e Drop superfluous assignment
And fix a branch annotation.
2015-12-12 23:21:36 +01:00
Christopher Jones
78f157f687 Merge branch 'PHP-7.0' 2015-12-13 08:22:30 +11:00
Christopher Jones
e0691d27d5 Merge branch 'PHP-5.6' into PHP-7.0 2015-12-13 08:22:14 +11:00
Christopher Jones
82d58e6cbc Update README 2015-12-13 08:21:41 +11:00
Reeze Xia
bdadec4581 Merge branch 'PHP-7.0'
* PHP-7.0:
  Unused value casting should be `void`
2015-12-12 23:29:46 +08:00
Reeze Xia
95ad414658 Unused value casting should be void 2015-12-12 23:25:30 +08:00
Christopher Jones
6ddc45b9c1 Merge branch 'PHP-7.0' 2015-12-12 16:08:14 +11:00
Christopher Jones
e4a48ab6b3 Prepare for a PECL release 2015-12-12 16:07:57 +11:00
Christopher Jones
915a00cd8b Merge branch 'PHP-5.6' into PHP-7.0 2015-12-12 16:06:44 +11:00
Christopher Jones
8f7e98ac4a Prepare for a PECL release 2015-12-12 16:06:08 +11:00
Xinchen Hui
0d8f5a43d3 Merge branch 'PHP-7.0'
Conflicts:
	NEWS
2015-12-11 09:13:26 -08:00
Xinchen Hui
1358743f9c Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-12-11 09:13:00 -08:00
Xinchen Hui
778e5f3da5 Fixed bug #71092 (Segmentation fault with return type hinting) 2015-12-11 09:11:28 -08:00
Anatol Belski
468b897fb5 Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  backported 7c981192eb from 7.0
2015-12-11 17:43:51 +01:00
Anatol Belski
050e21beed Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  backported 7c981192eb from 7.0
2015-12-11 17:43:36 +01:00
Anatol Belski
57eecd4e29 update NEWS 2015-12-11 17:42:01 +01:00
Anatol Belski
157d0372e0 backported 7c981192eb from 7.0
the way it doesn't hurt BC
2015-12-11 17:39:57 +01:00
Nikita Popov
b343cd913b Merge branch 'PHP-7.0' 2015-12-11 16:33:47 +01:00
Nikita Popov
04407b79df Fixed bug #71094
I didn't see any non-dummy readline tests to work off, so this
change is tested manually only.

While at it also fix other zval_dtors and use ZVAL_COPY.
2015-12-11 16:33:07 +01:00
Nikita Popov
1b683efa0f Merge branch 'PHP-7.0' 2015-12-11 16:06:28 +01:00
Nikita Popov
fd3ece8578 Fix bug #71086 2015-12-11 16:05:49 +01:00
Nikita Popov
591fe26d5d Remove BP_VAR_REF
The distinction between BP_VAR_REF and BP_VAR_W is no longer
revelant, since we dropped support for =& new.
2015-12-11 15:56:52 +01:00
Dmitry Stogov
1fdb63fbd9 ws fixes 2015-12-11 17:40:23 +03:00
Dmitry Stogov
21ba287c3c dos2unix 2015-12-11 17:29:42 +03:00
Dmitry Stogov
f243aaf985 Added e-SSA based DFA optimisation framework (incomplete) 2015-12-11 17:24:55 +03:00