Commit Graph

82566 Commits

Author SHA1 Message Date
Nikita Popov
1aaaedc1eb Dead code 2014-07-19 13:23:25 +02:00
Nikita Popov
6513e959d6 Fix for with empty expression lists 2014-07-19 13:21:12 +02:00
Nikita Popov
ef26f95676 Load lineno when compiling exprs 2014-07-19 13:13:58 +02:00
Nikita Popov
446cf29ab7 Fix compound assign to static property 2014-07-19 13:03:58 +02:00
Nikita Popov
09309a543f Remove dead code 2014-07-19 13:00:57 +02:00
Nikita Popov
74dba7e4db __autoload error 2014-07-19 12:57:31 +02:00
Nikita Popov
547331d24d Port methods
The duplicated magic method checks are ugly
2014-07-19 12:52:44 +02:00
Xinchen Hui
1c0e22f50c Merge branch 'PHP-5.6' 2014-07-19 17:19:57 +08:00
Xinchen Hui
1d2f232bd2 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 17:19:39 +08:00
Xinchen Hui
8ff00e6e85 Improve fix for #66608 2014-07-19 17:19:01 +08:00
Xinchen Hui
9ce1a36af2 Fixed segfault with empty break 2014-07-19 15:30:50 +08:00
Xinchen Hui
a3e8a10918 Merge branch 'PHP-5.6' 2014-07-19 13:12:56 +08:00
Xinchen Hui
cd95347cbc Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-07-19 13:12:42 +08:00
Xinchen Hui
9bef96d96e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 13:12:36 +08:00
Xinchen Hui
629c1ecd4f Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2014-07-19 13:12:26 +08:00
Xinchen Hui
f604b61e39 New added opcodes don't need to be resloved 2014-07-19 12:53:34 +08:00
Yasuo Ohgaki
f19eb82f7c Update NEWS 2014-07-19 10:13:15 +09:00
Yasuo Ohgaki
9b30b04b32 Update NEWS 2014-07-19 10:12:28 +09:00
Yasuo Ohgaki
ad744263ca Update NEWS 2014-07-19 10:11:42 +09:00
Yasuo Ohgaki
5ed63b3bfc Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 10:00:10 +09:00
Yasuo Ohgaki
d0d5a1c444 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:59:51 +09:00
Yasuo Ohgaki
f83a6c33b4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:53:04 +09:00
Yasuo Ohgaki
e946de29d2 Fixed bug #66827 Session raises E_NOTICE when session name variable is array 2014-07-19 09:52:31 +09:00
Nikita Popov
b9f62be2e6 Cleanup 2014-07-18 20:24:44 +02:00
Nikita Popov
d0b66f3af3 zend_emit_jump and zend_emit_cond_jump 2014-07-18 20:03:29 +02:00
Anatol Belski
af676be066 Merge branch 'PHP-5.6'
* PHP-5.6:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:41:31 +02:00
Anatol Belski
47e640164a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:40:58 +02:00
Anatol Belski
982342b057 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:40:09 +02:00
Anatol Belski
c5ccaf1d04 implemented copy libs of core exts in phpize mode 2014-07-18 18:38:57 +02:00
Rasmus Lerdorf
f8f6bd7a08 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
  Update NEWS
  Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
  Enable build without atoll (e.g old AIX flavours)
  Enable build without atoll (e.g old AIX flavours)
  implemented usage of the non core ext deps in phpize mode
  implemented force usage of generated .h and .js deps in phpize mode
  basic routines for phpize mode to
  Easier to read
  Add some trace info as well as update CLIENT_ flags
  Fix my name in the given credit
  Update NEWS for PR#723 merge
  Add ifdef on ecdh for single_ecdh_use
  fix C89 compat
  This test depends on expose_php being on
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
2014-07-18 08:14:08 -07:00
Nikita Popov
ca7a490758 zend_update_jump_target 2014-07-18 16:11:43 +02:00
Nikita Popov
0eab81f32b Remove bits of dead code 2014-07-18 15:53:38 +02:00
Nikita Popov
adbddf4e5b Support static closures 2014-07-18 15:47:46 +02:00
Nikita Popov
405b97e8a9 Handle function doc comments 2014-07-18 15:23:16 +02:00
Nikita Popov
cdcf78f730 Fix lexer/compiler interdependency 2014-07-18 15:05:31 +02:00
Nikita Popov
359f99fe48 Use dedicated func_decl ast node
Functions need a bunch of extra info, that becomes inconvenient
to handle using the normal ast structure.
2014-07-18 14:57:00 +02:00
Nikita Popov
3ad55e001e Small cleanup
Current problem: build_runtime_defined_function_key is lexer
coupled
2014-07-18 13:15:58 +02:00
Nikita Popov
ae5ba9abfb Port closures 2014-07-18 12:58:24 +02:00
Nikita Popov
abfc8bd894 Port closure use 2014-07-18 12:30:39 +02:00
Anatol Belski
78f2496f8c Merge branch 'PHP-5.6'
* PHP-5.6:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
2014-07-18 11:43:43 +02:00
Anatol Belski
f9d5d2abaa Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
2014-07-18 11:42:24 +02:00
Anatol Belski
f304fb848f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
2014-07-18 11:40:53 +02:00
Anatol Belski
35b077f53e fix copy the ext dll into the prefix path in phpize mode 2014-07-18 11:39:38 +02:00
Anatol Belski
8044d0680b fix default prefix in phpize mode 2014-07-18 11:36:44 +02:00
Anatol Belski
a8e0a623ec fix file with zero size usage in phpize mode 2014-07-18 11:35:32 +02:00
Xinchen Hui
6cc487df2c Revert "stash" (pushed by accident)
This reverts commit a18bf5fc93.
2014-07-18 16:27:31 +08:00
Xinchen Hui
110bf9c720 Merge remote-tracking branch 'origin/master' into phpng
Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
Xinchen Hui
f6f621ef69 Merge branch 'PHP-5.6' 2014-07-18 15:51:24 +08:00
Xinchen Hui
0d01891799 Update NEWS 2014-07-18 15:51:10 +08:00
Xinchen Hui
550b3e4306 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2014-07-18 15:48:56 +08:00