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

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

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

.travis.yml | 9 +-
NEWS | 466 +-
Zend/tests/bug60771.phpt | 1 +
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/bug64578.phpt | 14 +
Zend/zend_API.c | 95 +-
Zend/zend_API.h | 3 +
Zend/zend_alloc.c | 18 +-
Zend/zend_builtin_functions.c | 56 +-
Zend/zend_compile.c | 9 +-
Zend/zend_compile.h | 2 +-
Zend/zend_execute.c | 7 +-
Zend/zend_execute_API.c | 2 +-
Zend/zend_language_scanner.c | 6 +-
Zend/zend_language_scanner.l | 4 +-
Zend/zend_language_scanner_defs.h | 2 +-
Zend/zend_multiply.h | 4 +-
Zend/zend_vm_def.h | 36 +-
Zend/zend_vm_execute.h | 40 +-
acinclude.m4 | 4 +-
configure.in | 4 +-
ext/date/lib/timezonedb.h | 910 +-
ext/date/php_date.c | 21 +-
ext/date/tests/bug55397.phpt | 3 +-
ext/date/tests/bug62852.phpt | 26 +-
ext/date/tests/bug62852_var2.phpt | 25 +
ext/date/tests/bug62852_var3.phpt | 25 +
.../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 | 2 +
ext/gd/gd.c | 18 +-
ext/gd/libgd/gd_compat.h | 7 +
ext/gd/libgd/gd_rotate.c | 9 +-
ext/mysqli/mysqli.c | 2 +-
ext/mysqli/tests/bug64726.phpt | 23 +
ext/mysqlnd/mysqlnd_enum_n_def.h | 2 +-
ext/mysqlnd/mysqlnd_result.c | 1 +
ext/reflection/php_reflection.c | 3 +-
ext/reflection/tests/bug64239.phpt | 44 +
ext/skeleton/skeleton.c | 2 +-
ext/standard/credits_sapi.h | 2 +-
ext/standard/dns.c | 2 +-
ext/standard/head.c | 2 +-
ext/standard/http_fopen_wrapper.c | 9 +-
ext/standard/streamsfuncs.c | 2 +-
ext/standard/string.c | 4 +-
ext/standard/tests/file/bug24482.phpt | 5 +
ext/standard/tests/file/bug44805.phpt | 2 +-
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 +
main/main.c | 4 +-
main/php_ini.c | 2 +-
main/php_version.h | 6 +-
main/streams/streams.c | 15 +-
sapi/cli/php.1.in | 32 +-
sapi/cli/php_cli_server.c | 61 +-
sapi/cli/tests/bug64529.phpt | 67 +
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 +
win32/build/libs_version.txt | 32 +-
win32/sockets.c | 51 +-
win32/time.c | 19 +-
108 files changed, 72863 insertions(+), 47640 deletions(-)

Upstream: github.com

  • Share