mirror of
https://github.com/php/php-src.git
synced 2024-09-27 04:47:22 +00:00
f9927a6c97
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 |
||
---|---|---|
.. | ||
bug40459.phpt | ||
bug44712.phpt | ||
bug44818.phpt | ||
bug46024.phpt | ||
bug46426.phpt | ||
bug47997.phpt | ||
bug48309.phpt | ||
bug49936_win32.phpt | ||
bug49936.phpt | ||
bug53427.phpt | ||
bug53903.phpt | ||
bug54623.phpt | ||
bug54946.phpt | ||
bug60106.phpt | ||
bug60455_01.phpt | ||
bug60455_02.phpt | ||
bug60455_03.phpt | ||
bug60455_04.phpt | ||
bug60602.phpt | ||
bug60817.phpt | ||
bug61019.phpt | ||
bug61115-1.phpt | ||
bug61115-2.phpt | ||
bug61115.phpt | ||
bug61371-win.phpt | ||
bug61371.phpt | ||
bug63240.phpt | ||
bug64166_2.phpt | ||
bug64166_3.phpt | ||
bug64166.phpt | ||
bug64433_srv.inc | ||
bug64433.phpt | ||
bug64770.phpt | ||
bug65483.phpt | ||
stream_context_get_params_001.phpt | ||
stream_context_set_option_basic.phpt | ||
stream_context_set_option_error_001.phpt | ||
stream_context_set_option_error_002.phpt | ||
stream_copy_to_stream_socket.phpt | ||
stream_get_contents_001.phpt | ||
stream_get_contents_002.phpt | ||
stream_get_line_nb.phpt | ||
stream_get_line_NUL_delimiter.phpt | ||
stream_get_meta_data_dir_basic.phpt | ||
stream_get_meta_data_file_basic.phpt | ||
stream_get_meta_data_file_error.phpt | ||
stream_get_meta_data_file_variation1.phpt | ||
stream_get_meta_data_file_variation2.phpt | ||
stream_get_meta_data_file_variation4.phpt | ||
stream_get_meta_data_file_variation5.phpt | ||
stream_get_meta_data_process_basic.phpt | ||
stream_get_meta_data_socket_basic.phpt | ||
stream_get_meta_data_socket_variation1.phpt | ||
stream_get_meta_data_socket_variation2.phpt | ||
stream_get_meta_data_socket_variation3.phpt | ||
stream_get_meta_data_socket_variation4.phpt | ||
stream_is_local.phpt | ||
stream_resolve_include_path.phpt | ||
stream_set_chunk_size.phpt | ||
stream_set_timeout_error.phpt | ||
stream_socket_pair.phpt |