Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
..
2011-09-11 12:12:48 +00:00
2014-03-24 12:40:07 +08:00
2011-09-11 12:12:48 +00:00
2005-12-21 11:42:06 +00:00
2005-12-21 11:42:06 +00:00
2011-09-24 02:20:38 +00:00
2011-11-08 06:35:07 +00:00
2009-02-15 07:10:29 +00:00
2009-02-15 07:10:29 +00:00
2008-08-01 22:56:47 +00:00
2009-11-08 15:18:10 +00:00
2008-12-05 13:10:48 +00:00
2009-02-06 07:33:25 +00:00
2009-11-08 15:02:54 +00:00
2009-02-14 07:34:15 +00:00
2009-08-30 18:18:50 +00:00
2009-02-02 04:53:10 +00:00
2009-11-08 15:02:54 +00:00
2009-07-29 04:44:08 +00:00
2014-03-12 17:54:22 +09:00
2009-09-23 15:22:47 +00:00
2009-09-11 08:22:19 +00:00
2011-09-11 12:12:48 +00:00
2012-04-10 12:23:07 +02:00
2011-09-06 06:44:59 +00:00
2010-10-05 01:54:17 +00:00
2011-04-09 16:59:36 +00:00
2011-11-18 08:50:29 +00:00
2012-11-07 17:05:24 +08:00
2012-11-07 17:05:24 +08:00
2012-11-07 17:05:24 +08:00
2013-07-31 08:46:54 +09:00
2006-05-29 21:08:02 +00:00
2013-02-16 22:28:28 +08:00
2012-03-02 05:04:40 +00:00
2013-07-31 08:46:54 +09:00
2014-03-12 17:54:22 +09:00
2008-07-25 10:48:20 +00:00
2009-04-16 02:07:20 +00:00
2008-12-05 13:10:48 +00:00
2008-07-17 16:30:32 +00:00
2009-07-07 01:17:46 +00:00
2008-07-17 16:30:32 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2010-09-05 14:38:35 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2009-07-07 01:17:46 +00:00
2008-07-17 16:30:32 +00:00
2008-07-17 16:30:32 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2009-07-07 01:17:46 +00:00
2011-03-14 16:00:59 +00:00
2008-02-21 14:07:13 +00:00
2008-06-28 21:23:08 +00:00
2009-07-07 01:17:46 +00:00
2009-07-07 01:17:46 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2012-03-02 14:19:05 +00:00
2008-12-05 14:18:02 +00:00
2008-12-05 14:18:02 +00:00
2008-12-05 14:18:02 +00:00
2008-12-05 14:18:02 +00:00
2008-12-05 14:18:02 +00:00
2012-01-14 09:07:10 +00:00
2009-07-07 01:17:46 +00:00
2012-10-10 10:27:49 +08:00
2008-07-25 10:48:20 +00:00
2008-02-01 15:29:59 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2009-07-07 01:17:46 +00:00
2012-03-22 17:30:16 +08:00
2009-07-07 01:17:46 +00:00
2009-02-17 16:29:59 +00:00
2008-07-17 16:30:32 +00:00
2014-03-24 12:40:07 +08:00
2008-02-01 15:29:59 +00:00
2014-03-24 14:31:03 +08:00
2008-02-01 15:29:59 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2011-09-04 05:00:30 +00:00
2014-03-24 17:14:29 +08:00
2009-11-08 15:02:54 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2008-07-24 13:49:39 +00:00
2011-09-11 12:12:48 +00:00
2011-09-11 12:12:48 +00:00
2008-07-17 16:30:32 +00:00
2008-02-01 15:29:59 +00:00
2008-06-28 21:23:08 +00:00
2008-02-01 15:29:59 +00:00
2008-07-25 10:48:20 +00:00
2008-12-05 13:10:48 +00:00
2012-04-10 12:23:07 +02:00
2012-04-10 12:23:07 +02:00
2012-04-10 12:23:07 +02:00
2012-04-10 12:23:07 +02:00
2012-04-10 12:23:07 +02:00
2012-04-10 12:23:07 +02:00
2012-04-10 12:23:07 +02:00
2013-02-10 15:04:23 +09:00
2008-12-05 13:10:48 +00:00
2013-02-10 15:04:23 +09:00
2008-12-05 13:10:48 +00:00
2008-12-05 14:18:02 +00:00
2008-12-05 13:10:48 +00:00
2013-05-09 15:57:25 +08:00
2010-11-09 03:23:04 +00:00
2008-07-17 16:30:32 +00:00
2008-07-17 16:30:32 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2009-02-15 07:10:29 +00:00
2014-03-24 14:31:03 +08:00
2009-02-17 10:08:25 +00:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2008-02-01 15:29:59 +00:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2008-07-25 10:48:20 +00:00
2008-07-17 16:30:32 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 12:40:07 +08:00
2008-02-01 15:29:59 +00:00
2014-03-24 12:40:07 +08:00
2014-03-24 12:40:07 +08:00
2014-03-24 12:40:07 +08:00
2014-03-24 12:40:07 +08:00
2009-02-15 07:10:29 +00:00
2014-03-24 12:40:07 +08:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2009-02-15 07:10:29 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 12:40:07 +08:00
2008-07-25 10:48:20 +00:00
2014-03-24 12:40:07 +08:00
2014-03-24 12:40:07 +08:00
2009-02-15 07:10:29 +00:00
2014-03-24 12:40:07 +08:00
2008-07-25 10:48:20 +00:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2014-03-24 14:31:03 +08:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-07-24 13:46:50 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2008-02-21 14:07:13 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-07-25 10:48:20 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-07-25 10:48:20 +00:00
2008-12-05 13:10:48 +00:00
2008-07-17 16:30:32 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2009-06-09 20:18:31 +00:00
2008-12-05 13:10:48 +00:00
2008-07-31 17:37:12 +00:00
2008-07-31 11:50:16 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2008-07-25 10:48:20 +00:00
2008-12-05 13:10:48 +00:00
2009-02-15 07:18:30 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-06-28 21:23:08 +00:00
2008-02-01 15:29:59 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-07-25 10:48:20 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-12-05 13:10:48 +00:00
2008-11-19 11:41:47 +00:00
2005-08-05 20:38:50 +00:00
2008-11-19 11:41:47 +00:00
2008-11-19 11:41:47 +00:00
2011-09-23 11:11:38 +00:00
2014-01-19 13:29:45 +09:00
2014-04-26 00:32:51 +04:00
2014-01-19 13:29:45 +09:00
2014-01-19 13:29:45 +09:00
2014-01-19 13:29:45 +09:00
2014-04-26 00:32:51 +04:00
2014-03-12 17:54:22 +09:00
2014-04-05 18:34:39 -07:00
2014-03-12 17:54:22 +09:00
2014-04-10 23:07:00 +04:00
2014-04-10 23:07:00 +04:00
2014-04-26 00:32:51 +04:00
2014-01-19 13:29:45 +09:00
2014-01-19 13:29:45 +09:00