com php-src: 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 e xpression handling (we need to review them care fully) I also reverted all our
attempts to support sapi/phpdbg (we didn't test it anywa y): Zend/zend.h Zend/zend_API.c Zend/zend_API .h Zend/zend_ast.c Zend/zend_compile.c
Zend/zen d_compile.h Z

From: Date: Fri, 25 Apr 2014 20:32:51 +0000
Subject: com php-src: 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 e xpression handling (we need to review them care fully) I also reverted all our
attempts to support sapi/phpdbg (we didn't test it anywa y): Zend/zend.h Zend/zend_API.c Zend/zend_API .h Zend/zend_ast.c Zend/zend_compile.c
Zend/zen d_compile.h Z
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77285@lists.php.net to get a copy of this message
Commit: f9927a6c97208c60d922f9a4e98feb8079c57d1f Author: Dmitry Stogov <dmitry@zend.com> Sat, 26 Apr 2014 00:32:51 +0400 Parents: 4e7cbf3f5842abe6688c11ce3cc11d2eabf0695f b82d077f988606580e5c06a9da18fe4f60ddb7cb Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f9927a6c97208c60d922f9a4e98feb8079c57d1f Log: 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 Changed paths: MM Zend/zend.h MM Zend/zend_API.c MM Zend/zend_API.h MM Zend/zend_ast.c MM Zend/zend_compile.c MM Zend/zend_compile.h MM Zend/zend_constants.c MM Zend/zend_exceptions.c MM Zend/zend_execute.c MM Zend/zend_execute.h MM Zend/zend_execute_API.c MM Zend/zend_highlight.c MM Zend/zend_ini_parser.y MM Zend/zend_language_parser.y MM Zend/zend_language_scanner.c MM Zend/zend_language_scanner.l MM Zend/zend_object_handlers.c MM Zend/zend_opcode.c MM Zend/zend_operators.c MM Zend/zend_operators.h MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM Zend/zend_vm_gen.php MM ext/bz2/bz2.c MM ext/curl/interface.c MM ext/date/php_date.c MM ext/date/php_date.h MM ext/dba/dba.c MM ext/dom/document.c MM ext/dom/documenttype.c MM ext/gd/gd.c MM ext/hash/hash.c MM ext/iconv/iconv.c MM ext/interbase/ibase_query.c MM ext/interbase/ibase_service.c MM ext/intl/converter/converter..c MM ext/ldap/ldap.c MM ext/libxml/libxml.c MM ext/mbstring/mbstring.c MM ext/mbstring/tests/zend_multibyte-02.phpt MM ext/mbstring/tests/zend_multibyte-06.phpt MM ext/mbstring/tests/zend_multibyte-12.phpt MM ext/mcrypt/mcrypt.c MM ext/mysql/php_mysql.c MM ext/mysqli/mysqli.c MM ext/mysqli/mysqli_api.c MM ext/mysqli/mysqli_nonapi.c MM ext/mysqli/mysqli_prop.c MM ext/oci8/oci8_interface.c MM ext/oci8/oci8_statement.c MM ext/opcache/ZendAccelerator.c MM ext/opcache/ZendAccelerator.h MM ext/opcache/zend_accelerator_module.c MM ext/opcache/zend_accelerator_util_funcs.c MM ext/opcache/zend_persist.c MM ext/openssl/openssl.c MM ext/pcre/php_pcre.c MM ext/pdo/pdo_dbh.c MM ext/pdo/pdo_stmt.c MM ext/pdo_firebird/firebird_driver.c MM ext/pdo_mysql/mysql_driver.c MM ext/pdo_pgsql/pgsql_driver.c MM ext/pdo_pgsql/pgsql_statement.c MM ext/pgsql/pgsql.c MM ext/phar/phar_object.c MM ext/reflection/php_reflection.c MM ext/session/mod_files.c MM ext/session/session.c MM ext/simplexml/simplexml.c MM ext/soap/php_encoding.c MM ext/spl/spl_array.c MM ext/spl/spl_directory.c MM ext/spl/spl_iterators.c MM ext/spl/spl_observer.c MM ext/standard/array.c MM ext/standard/basic_functions.c MM ext/standard/basic_functions.h MM ext/standard/dns_win32.c MM ext/standard/file.c MM ext/standard/html.c MM ext/standard/image.c MM ext/standard/mail.c MM ext/standard/math.c MM ext/standard/php_array.h MM ext/standard/proc_open.c MM ext/standard/streamsfuncs.c MM ext/standard/string..c MM ext/standard/url.c MM ext/standard/user_filters.c MM ext/standard/var_unserializer.c MM ext/standard/var_unserializer.re MM ext/xmlrpc/xmlrpc-epi-php.c MM ext/zip/php_zip.c MM main/SAPI.c MM main/SAPI.h MM main/main.c MM main/output.c MM main/php_globals.h MM main/php_ini.c MM main/php_streams.h MM main/php_variables.c MM main/streams/streams.c MM main/streams/xp_socket.c MM sapi/cgi/cgi_main.c MM sapi/cli/php_cli_server.c MM sapi/litespeed/lsapi_main.c Diff: <Diff exceeded maximum size>

« previous php.cvs (#77285) next »