1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Commit Graph

93687 Commits

Author SHA1 Message Date
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
Remi Collet 5d2e287982 Merge branch 'PHP-7.0'
* PHP-7.0:
  NEWS
  NEWS
  Fix Bug #71089 No check to duplicate zend_extension
2015-12-11 13:23:36 +01:00
Remi Collet 7a5c7e00cd NEWS 2015-12-11 13:23:21 +01:00
Remi Collet 66398757fc Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  NEWS
  Fix Bug #71089 No check to duplicate zend_extension
2015-12-11 13:22:55 +01:00
Remi Collet d403a91c6f NEWS 2015-12-11 13:22:13 +01:00
Remi Collet 410eacc1a9 Fix Bug #71089 No check to duplicate zend_extension 2015-12-11 13:21:24 +01:00
Xinchen Hui 18b97c94b2 Merge branch 'PHP-7.0' 2015-12-11 17:26:48 +08:00
Xinchen Hui b5adfee320 Fixed bug memleak in header_register_callback 2015-12-11 17:26:31 +08:00
Dmitry Stogov 061a90f8d1 Describe special meaning of IS_UNUSED oprerand 2015-12-11 02:31:28 +03:00
Dmitry Stogov dc36810993 Use more compact description encoding schema to free some bits 2015-12-11 01:45:26 +03:00
Nikita Popov fc2cedfb1d Make 2nd arg of xml_set_object by value
The argument is not being modified. Probably holdover from PHP 4
days.
2015-12-10 23:35:25 +01:00
Dmitry Stogov 047c84521c Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Make duplicate class constant error for internal class
  Make ZEND_CLONE return a TMP_VAR
2015-12-11 00:48:20 +03:00
Dmitry Stogov cba1a8498c Improve Optimizer debugging facility (print the meaning of extended_value) 2015-12-11 00:47:02 +03:00
Nikita Popov 04e3d82b55 Make duplicate class constant error for internal class
And drop two duplicate constant declarations from intl. These
were leaking previously.
2015-12-10 22:22:49 +01:00
Nikita Popov 8e5e3301a1 Make ZEND_CLONE return a TMP_VAR
As the return value can't be reference and it's unlikely to be
unused.

Also remove some unnecessary checks for ce==NULL. A ce is required
nowadays.
2015-12-10 22:16:25 +01:00
Dmitry Stogov f30381ec22 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Add missed tests for FETCH_GLOBAL_LOCK change
  Fix cleanup in bug70748.phpt
2015-12-10 21:20:30 +03:00
Dmitry Stogov 4c9e4caab4 Fixed typo 2015-12-10 21:17:24 +03:00
Nikita Popov 288cc6e192 Add missed tests for FETCH_GLOBAL_LOCK change 2015-12-10 19:17:17 +01:00
Nikita Popov 11f2a393f8 Merge branch 'PHP-7.0' 2015-12-10 19:15:21 +01:00
Nikita Popov 5c5209d676 Fix cleanup in bug70748.phpt
git add Zend/tests usable again...
2015-12-10 19:14:49 +01:00
Nikita Popov f1278edefc Drop two compiler TODOs
Call-time pass by reference is now a parse error.
There is no benefit in dropping implementing_class currently.
2015-12-10 19:04:59 +01:00
Nikita Popov c8a64e289c Reintroduce use of FETCH_GLOBAL_LOCK
Just found this old AST todo...

It no longer makes sense as an optimization due to the introduction
of BIND_GLOBAL, however it ensures that the global variable name is
not evaluated twice, which is presumably something we wish to
guarantee.
2015-12-10 19:04:59 +01:00
Bob Weinand 7ea1cf2e57 Improved specializer:
- Allow dispatching from specialized handler to unspecialized one
2015-12-10 20:46:14 +03:00
Nikita Popov 3fa86105f7 Remove FETCH_STATIC_MEMBER flag 2015-12-10 18:25:29 +01:00
Nikita Popov 3d4a2d2002 Merge branch 'PHP-7.0'
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2015-12-10 18:24:29 +01:00
Nikita Popov 798d168d73 Make update_opN_const implementation symmetric
So the main structure is the same...
2015-12-10 18:18:10 +01:00
Nikita Popov 37f3425263 Fix Foo::${42} and similar
Fixes segfault on direct use, segfault on opcache evaluated use,
leak on temporary use.

Fixes analogeous segfault for ${42} on opcache eval as well.
2015-12-10 18:14:40 +01:00