com php-src: Merge branch 'PHP-5.6': Zend/zend.c Zend/zend.h Zend/zend_API.c Zend/zend_API.h Zend/zend_alloc .c Zend/zend_alloc.h Zend/zend_ast.c
Zend/zend _execute.h Zend/zend_execute_API.c Zend/zend_ex tensions.c Zend/zend_extensions.h Zend/zend_indent .c Zend/zend_indent.h
Zend/zend_interfaces.c Ze nd/zend_modules.h Zend/zend_object_handlers.c Zen d/zend_vm_def.h Zend/zend_vm_execute.h Zend/zen d_vm_gen.php
Zend/zend_vm_opcodes.h ext/dba/dba _inifile.
| From: | Xinchen Hui | Date: | Fri, 03 Jan 2014 03:09:07 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': Zend/zend.c Zend/zend.h Zend/zend_API.c Zend/zend_API.h Zend/zend_alloc .c Zend/zend_alloc.h Zend/zend_ast.c Zend/zend _execute.h Zend/zend_execute_API.c Zend/zend_ex tensions.c Zend/zend_extensions.h Zend/zend_indent .c Zend/zend_indent.h Zend/zend_interfaces.c Ze nd/zend_modules.h Zend/zend_object_handlers.c Zen d/zend_vm_def.h Zend/zend_vm_execute.h Zend/zen d_vm_gen.php Zend/zend_vm_opcodes.h ext/dba/dba _inifile. |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75527@lists.php.net to get a copy of this message | ||
Commit: 0f53e37494e5cb280cb37c4ab15fe82e0c92a69e
Author: Xinchen Hui <laruence@php.net> Fri, 3 Jan 2014 11:09:07 +0800
Parents: c9f909cd4297cee26c0033efaa31e45d6ec8d9f2 c081ce628f0d76d44784d7bb8e06428b06142ac0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f53e37494e5cb280cb37c4ab15fe82e0c92a69e
Log:
Merge branch 'PHP-5.6'
Changed paths:
MM Zend/zend.c
MM Zend/zend.h
MM Zend/zend_API.c
MM Zend/zend_API.h
MM Zend/zend_alloc.c
MM Zend/zend_alloc.h
MM Zend/zend_ast.c
MM Zend/zend_execute.h
MM Zend/zend_execute_API.c
MM Zend/zend_extensions.c
MM Zend/zend_extensions.h
MM Zend/zend_indent.c
MM Zend/zend_indent.h
MM Zend/zend_interfaces.c
MM Zend/zend_modules.h
MM Zend/zend_object_handlers.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.h
MM ext/dba/dba_inifile.c
MM ext/dba/libinifile/inifile.c
MM ext/dba/libinifile/inifile.h
MM ext/dom/php_dom.c
MM ext/json/json.c
MM ext/mysqlnd/mysqlnd_net.c
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/ZendAccelerator.h
MM ext/opcache/zend_accelerator_module.c
MM ext/opcache/zend_accelerator_module.h
MM ext/openssl/xp_ssl.c
MM ext/pcntl/pcntl.c
MM ext/soap/php_encoding.c
MM ext/spl/spl_array.c
MM ext/spl/spl_directory.c
MM ext/spl/spl_fixedarray.c
MM ext/spl/spl_iterators.c
MM ext/standard/array.c
MM ext/standard/basic_functions.c
MM ext/standard/ftp_fopen_wrapper.c
MM ext/standard/http_fopen_wrapper.c
MM ext/standard/type.c
MM ext/xsl/php_xsl.c
MM main/SAPI.c
MM main/SAPI.h
MM main/main.c
MM main/php.h
MM main/php_content_types.c
MM main/php_globals.h
MM main/php_ini.c
MM main/php_ticks.c
MM main/php_ticks.h
MM main/php_variables.c
MM main/streams/php_stream_context.h
MM main/streams/streams.c
MM main/streams/transports.c
MM main/streams/userspace.c
MM sapi/apache/mod_php5.c
MM sapi/apache2filter/sapi_apache2.c
MM sapi/apache2handler/sapi_apache2.c
MM sapi/apache_hooks/mod_php5.c
MM sapi/apache_hooks/php_apache.c
MM sapi/caudium/caudium.c
MM sapi/cgi/cgi_main.c
MM sapi/cli/php_cli.c
MM sapi/cli/php_cli_server.c
MM sapi/continuity/capi.c
MM sapi/embed/php_embed.c
MM sapi/fpm/fpm/fpm_main.c
MM sapi/milter/php_milter.c
MM sapi/nsapi/nsapi.c
MM sapi/pi3web/pi3web_sapi..c
MM sapi/roxen/roxen.c
MM sapi/thttpd/thttpd.c
MM sapi/tux/php_tux.c
Diff: