Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

Programming / Compilers / PHP - Boris Lytochkin [php.net] - 3 May 2013 02:22 UTC

5f67584 Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

.gitattributes | 2 +
.travis.yml | 4 +-
Makefile.gcov | 2 +-
NEWS | 103 +-
README.RELEASE_PROCESS | 3 +-
UPGRADING | 109 +-
UPGRADING.INTERNALS | 50 +-
Zend/acinclude.m4 | 2 +-
Zend/tests/bug43450.phpt | 2 +
Zend/tests/bug52041.phpt | 12 +-
Zend/tests/bug60536_001.phpt | 2 +-
Zend/tests/bug60771.phpt | 1 +
Zend/tests/bug62005.phpt | 2 +-
Zend/tests/bug62343.phpt | 13 +
Zend/tests/bug63976.phpt | 20 +
Zend/tests/bug64239_1.phpt | 28 +
Zend/tests/bug64239_2.phpt | 58 +
Zend/tests/bug64239_3.phpt | 33 +
Zend/tests/bug64239_4.phpt | 31 +
Zend/tests/bug64417.phpt | 39 +
Zend/tests/bug64515.phpt | 12 +
Zend/tests/bug64555.phpt | 42 +
Zend/tests/bug64578.phpt | 14 +
Zend/tests/bug64677.phpt | 21 +
Zend/tests/generators/clone.phpt | 31 +-
Zend/tests/generators/clone_after_object_call.phpt | 20 -
Zend/tests/generators/clone_with_foreach.phpt | 33 -
Zend/tests/generators/clone_with_properties.phpt | 18 -
Zend/tests/generators/clone_with_stack.phpt | 18 -
Zend/tests/generators/clone_with_symbol_table.phpt | 27 -
Zend/tests/generators/clone_with_this.phpt | 24 -
Zend/tests/generators/nested_method_calls.phpt | 5 +-
.../tests/generators/yield_during_method_call.phpt | 8 -
Zend/zend_API.c | 95 +-
Zend/zend_API.h | 3 +
Zend/zend_alloc.c | 17 +-
Zend/zend_builtin_functions.c | 58 +-
Zend/zend_compile.c | 10 +-
Zend/zend_compile.h | 2 +-
Zend/zend_execute.c | 18 +-
Zend/zend_execute_API.c | 2 +-
Zend/zend_float.h | 6 +-
Zend/zend_generators.c | 171 +-
Zend/zend_generators.h | 4 +-
Zend/zend_hash.c | 2 +-
Zend/zend_ini_parser.y | 6 +-
Zend/zend_ini_scanner.c | 711 +-
Zend/zend_ini_scanner.l | 8 +-
Zend/zend_language_parser.y | 12 +-
Zend/zend_language_scanner.c | 4 +-
Zend/zend_language_scanner.l | 4 +-
Zend/zend_multiply.h | 4 +-
Zend/zend_object_handlers.c | 2 +-
Zend/zend_vm_def.h | 40 +-
Zend/zend_vm_execute.h | 44 +-
acinclude.m4 | 4 +-
configure.in | 2 +-
ext/curl/config.m4 | 10 +-
ext/curl/config.w32 | 3 +-
ext/curl/interface.c | 30 -
ext/curl/php_curl.h | 32 -
ext/curl/streams.c | 542 -
ext/curl/tests/check_win_config.phpt | 48 +
ext/date/lib/parse_date.c | 234 +-
ext/date/lib/parse_date.re | 38 +-
ext/date/lib/parse_iso_intervals.c | 71 +-
ext/date/lib/parse_iso_intervals.re | 35 -
ext/date/lib/timelib.c | 34 +
ext/date/lib/timelib.h | 2 +
ext/date/lib/timezonedb.h | 910 +-
ext/date/php_date.c | 203 +-
ext/date/php_date.h | 3 +
ext/date/tests/014.phpt | 6 +-
ext/date/tests/DatePeriod_wrong_constructor.phpt | 4 +-
ext/date/tests/DateTimeZone_clone_basic1.phpt | 12 +-
ext/date/tests/DateTimeZone_clone_basic2.phpt | 24 +-
ext/date/tests/DateTimeZone_clone_basic3.phpt | 30 +-
ext/date/tests/DateTimeZone_construct_basic.phpt | 18 +-
ext/date/tests/DateTimeZone_serialize.phpt | 29 -
ext/date/tests/DateTimeZone_serialize_type_1.phpt | 35 +
ext/date/tests/DateTimeZone_serialize_type_2.phpt | 35 +
ext/date/tests/DateTimeZone_serialize_type_3.phpt | 35 +
ext/date/tests/DateTimeZone_verify.phpt | 28 +-
ext/date/tests/bug60774.phpt | 44 +
ext/date/tests/date_format_error.phpt | 6 +-
ext/date/tests/date_format_variation1.phpt | 60 +-
ext/date/tests/date_offset_get_error.phpt | 10 +-
ext/date/tests/date_offset_get_variation1.phpt | 60 +-
ext/date/tests/date_timestamp_get.phpt | 2 +-
ext/date/tests/date_timezone_get_error.phpt | 12 +-
ext/date/tests/date_timezone_get_variation1.phpt | 62 +-
ext/date/tests/timezone_open_basic1.phpt | 18 +-
ext/dba/dba.c | 1 -
.../DOMDocument_validate_on_parse_variation.phpt | 2 +-
ext/dom/tests/DOMNode_insertBefore_error2.phpt | 38 +
ext/dom/tests/DOMNode_insertBefore_error3.phpt | 39 +
ext/dom/tests/DOMNode_insertBefore_error4.phpt | 38 +
ext/dom/tests/DOMNode_insertBefore_error5.phpt | 40 +
ext/dom/tests/DOMNode_insertBefore_error6.phpt | 35 +
ext/fileinfo/data_file.c |107380 ++++++++++++--------
ext/fileinfo/libmagic.patch | 1870 +-
ext/fileinfo/libmagic/apprentice.c | 1014 +-
ext/fileinfo/libmagic/ascmagic.c | 11 +-
ext/fileinfo/libmagic/cdf.c | 8 +-
ext/fileinfo/libmagic/cdf.h | 4 +-
ext/fileinfo/libmagic/cdf_time.c | 18 +-
ext/fileinfo/libmagic/compress.c | 24 +-
ext/fileinfo/libmagic/elfclass.h | 3 +-
ext/fileinfo/libmagic/file.h | 58 +-
ext/fileinfo/libmagic/fsmagic.c | 73 +-
ext/fileinfo/libmagic/funcs.c | 26 +-
ext/fileinfo/libmagic/magic.c | 107 +-
ext/fileinfo/libmagic/magic.h | 3 +
ext/fileinfo/libmagic/patchlevel.h | 6 +-
ext/fileinfo/libmagic/print.c | 26 +-
ext/fileinfo/libmagic/readcdf.c | 24 +-
ext/fileinfo/libmagic/readelf.c | 36 +-
ext/fileinfo/libmagic/softmagic.c | 333 +-
ext/fileinfo/tests/finfo_file_basic.phpt | 2 +-
ext/fileinfo/tests/finfo_open_error.phpt | 18 +-
ext/fileinfo/tests/magic | 6316 +-
ext/gd/config.m4 | 9 +-
ext/gd/config.w32 | 4 +-
ext/gd/gd.c | 528 +-
ext/gd/libgd/gd.c | 81 +-
ext/gd/libgd/gd.h | 149 +-
ext/gd/libgd/gd_compat.c | 47 +
ext/gd/libgd/gd_compat.h | 10 +
ext/gd/libgd/gd_interpolation.c | 2564 +
ext/gd/libgd/gd_jpeg.c | 25 +-
ext/gd/libgd/gd_matrix.c | 334 +
ext/gd/libgd/gd_rotate.c | 9 +-
ext/gd/php_gd.h | 11 +-
ext/intl/breakiterator/breakiterator_methods.cpp | 10 +-
ext/mysql/tests/mysql_field_flags.phpt | 6 +-
ext/mysql/tests/mysql_list_fields.phpt | 2 +-
ext/mysqli/mysqli.c | 2 +-
ext/mysqli/tests/bug64726.phpt | 23 +
ext/mysqlnd/mysqlnd.c | 1 +
ext/mysqlnd/mysqlnd_charset.c | 20 +-
ext/mysqlnd/mysqlnd_enum_n_def.h | 2 +-
ext/mysqlnd/mysqlnd_result.c | 1 +
ext/mysqlnd/mysqlnd_structs.h | 2 +-
ext/opcache/Optimizer/block_pass.c | 114 +-
ext/opcache/Optimizer/pass1_5.c | 4 +
ext/opcache/Optimizer/zend_optimizer.c | 19 +-
ext/opcache/Optimizer/zend_optimizer.h | 2 +-
ext/opcache/Optimizer/zend_optimizer_internal.h | 4 +-
ext/opcache/README | 52 +-
ext/opcache/ZendAccelerator.c | 207 +-
ext/opcache/ZendAccelerator.h | 26 +-
ext/opcache/config.m4 | 37 +-
ext/opcache/config.w32 | 2 +-
ext/opcache/shared_alloc_mmap.c | 2 +-
ext/opcache/shared_alloc_posix.c | 2 +-
ext/opcache/shared_alloc_shm.c | 4 +-
ext/opcache/shared_alloc_win32.c | 28 +-
ext/opcache/tests/blacklist.phpt | 20 +
ext/opcache/tests/bug64353.phpt | 2 +-
ext/opcache/tests/bug64482.inc | 2 +
ext/opcache/tests/bug64482.phpt | 17 +
ext/opcache/tests/issue0079.phpt | 34 +
ext/opcache/tests/opcache-1.blacklist | 5 +
ext/opcache/tests/opcache-2.blacklist | 1 +
ext/opcache/tests/skipif.inc | 2 +-
ext/opcache/zend_accelerator_blacklist.c | 43 +-
ext/opcache/zend_accelerator_blacklist.h | 2 +-
ext/opcache/zend_accelerator_debug.c | 2 +-
ext/opcache/zend_accelerator_debug.h | 2 +-
ext/opcache/zend_accelerator_hash.c | 2 +-
ext/opcache/zend_accelerator_hash.h | 2 +-
ext/opcache/zend_accelerator_module.c | 139 +-
ext/opcache/zend_accelerator_module.h | 2 +-
ext/opcache/zend_accelerator_util_funcs.c | 17 +-
ext/opcache/zend_accelerator_util_funcs.h | 2 +-
ext/opcache/zend_persist.c | 2 +-
ext/opcache/zend_persist.h | 2 +-
ext/opcache/zend_persist_calc.c | 2 +-
ext/opcache/zend_shared_alloc.c | 35 +-
ext/opcache/zend_shared_alloc.h | 6 +-
ext/pdo_pgsql/tests/is_in_transaction.phpt | 8 +-
ext/pgsql/tests/bug46408.phpt | 3 +
ext/phar/tests/phpinfo_001.phpt | 4 +-
ext/phar/tests/phpinfo_002.phpt | 2 +-
ext/phar/tests/phpinfo_004.phpt | 4 +-
ext/reflection/php_reflection.c | 3 +-
ext/reflection/tests/bug64239.phpt | 44 +
ext/skeleton/skeleton.c | 2 +-
ext/soap/php_http.c | 66 +-
ext/soap/php_soap.h | 7 +
ext/soap/soap.c | 11 +
ext/soap/tests/bugs/bug34657.phpt | 7 +-
ext/spl/spl_dllist.c | 66 +-
.../SplDoublyLinkedList_add_invalid_offset.phpt | 13 +
...SplDoublyLinkedList_add_missing_parameter1.phpt | 11 +
...SplDoublyLinkedList_add_missing_parameter2.phpt | 11 +
.../tests/SplDoublyLinkedList_add_null_offset.phpt | 13 +
ext/spl/tests/dllist_013.phpt | 45 +
ext/standard/array.c | 96 +
ext/standard/basic_functions.c | 11 +-
ext/standard/dl.c | 5 +
ext/standard/dns.c | 2 +-
ext/standard/head.c | 2 +-
ext/standard/http_fopen_wrapper.c | 9 +-
ext/standard/info.c | 8 +-
ext/standard/php_array.h | 1 +
ext/standard/streamsfuncs.c | 2 +-
ext/standard/string.c | 4 +-
ext/standard/tests/array/array_column_basic.phpt | 327 +
ext/standard/tests/array/array_column_error.phpt | 82 +
.../tests/array/array_column_object_cast.phpt | 52 +
ext/standard/tests/array/array_column_variant.phpt | 85 +
ext/standard/tests/file/bug24482.phpt | 5 +
ext/standard/tests/file/bug44805.phpt | 2 +-
ext/standard/tests/file/parse_ini_file.phpt | 36 +-
.../general_functions/parse_ini_string_001.phpt | 36 +-
ext/standard/tests/streams/bug64433.phpt | 86 +
ext/standard/tests/streams/bug64433_srv.inc | 14 +
ext/standard/tests/strings/stristr_error.phpt | 4 +-
ext/standard/tests/strings/strstr.phpt | Bin 10539 -> 10530 bytes
ext/zip/lib/zip_close.c | 5 +-
ext/zip/lib/zip_dirent.c | 12 +-
ext/zip/php_zip.c | 7 +
ext/zip/tests/bug64342_0.phpt | 42 +
ext/zip/tests/bug64342_1.phpt | 37 +
ext/zlib/tests/bug_52944-win.phpt | 24 -
ext/zlib/tests/bug_52944.phpt | 7 +-
main/main.c | 4 +-
main/php_ini.c | 2 +-
main/streams/streams.c | 15 +-
main/win32_internal_function_disabled.h | 6 +-
makedist | 5 +-
php.ini-development | 96 +
php.ini-production | 96 +
sapi/cli/php.1.in | 32 +-
sapi/cli/php_cli.c | 2 +-
sapi/cli/php_cli_server.c | 61 +-
sapi/cli/ps_title.c | 21 +-
sapi/cli/tests/bug64529.phpt | 67 +
sapi/cli/tests/bug64544.phpt | 20 +
sapi/fpm/fpm/fpm_conf.c | 17 +-
sapi/fpm/fpm/fpm_log.c | 16 +-
sapi/fpm/fpm/fpm_main.c | 215 +-
sapi/fpm/fpm/fpm_signals.c | 4 +-
sapi/fpm/fpm/fpm_sockets.c | 10 +-
sapi/fpm/fpm/fpm_stdio.c | 5 +-
sapi/fpm/fpm/fpm_worker_pool.c | 20 +-
sapi/fpm/fpm/fpm_worker_pool.h | 1 +
tests/basic/req60524-win.phpt | 13 +
tests/basic/req60524.phpt | 6 +
tests/classes/implicit_instantiation_001.phpt | 14 +-
tests/func/011.phpt | 10 +
tests/func/bug64523.phpt | 10 +
win32/build/libs_version.txt | 5 +-
win32/sockets.c | 51 +-
win32/time.c | 19 +-
256 files changed, 79584 insertions(+), 49564 deletions(-)

Upstream: github.com

  • Share