]> granicus.if.org Git - php/commit
Merge mainstream 'master' branch into refactoring
authorDmitry Stogov <dmitry@zend.com>
Fri, 25 Apr 2014 20:32:51 +0000 (00:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 25 Apr 2014 20:32:51 +0000 (00:32 +0400)
commitf9927a6c97208c60d922f9a4e98feb8079c57d1f
tree35815b69d1bf7d47fb41e857ff8d2b024ddac153
parent4e7cbf3f5842abe6688c11ce3cc11d2eabf0695f
parentb82d077f988606580e5c06a9da18fe4f60ddb7cb
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
106 files changed:
Zend/zend.h
Zend/zend_API.c
Zend/zend_API.h
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_highlight.c
Zend/zend_ini_parser.y
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_object_handlers.c
Zend/zend_opcode.c
Zend/zend_operators.c
Zend/zend_operators.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_gen.php
ext/bz2/bz2.c
ext/curl/interface.c
ext/date/php_date.c
ext/date/php_date.h
ext/dba/dba.c
ext/dom/document.c
ext/dom/documenttype.c
ext/gd/gd.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/interbase/ibase_query.c
ext/interbase/ibase_service.c
ext/intl/converter/converter.c
ext/ldap/ldap.c
ext/libxml/libxml.c
ext/mbstring/mbstring.c
ext/mbstring/tests/zend_multibyte-02.phpt
ext/mbstring/tests/zend_multibyte-06.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mcrypt/mcrypt.c
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_nonapi.c
ext/mysqli/mysqli_prop.c
ext/oci8/oci8_interface.c
ext/oci8/oci8_statement.c
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h
ext/opcache/zend_accelerator_module.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/openssl/openssl.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_firebird/firebird_driver.c
ext/pdo_mysql/mysql_driver.c
ext/pdo_pgsql/pgsql_driver.c
ext/pdo_pgsql/pgsql_statement.c
ext/pgsql/pgsql.c
ext/phar/phar_object.c
ext/reflection/php_reflection.c
ext/session/mod_files.c
ext/session/session.c
ext/simplexml/simplexml.c
ext/soap/php_encoding.c
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/spl/spl_iterators.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/basic_functions.h
ext/standard/dns_win32.c
ext/standard/file.c
ext/standard/html.c
ext/standard/image.c
ext/standard/mail.c
ext/standard/math.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/string.c
ext/standard/url.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xmlrpc/xmlrpc-epi-php.c
ext/zip/php_zip.c
main/SAPI.c
main/SAPI.h
main/main.c
main/output.c
main/php_globals.h
main/php_ini.c
main/php_streams.h
main/php_variables.c
main/streams/streams.c
main/streams/xp_socket.c
sapi/cgi/cgi_main.c
sapi/cli/php_cli_server.c
sapi/litespeed/lsapi_main.c