php-src/ext/zip/lib
Stanislav Malyshev 1ecd82f588 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
  oops, no idea how this got in
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
  add NEWS
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path

Conflicts:
	ext/ereg/regex/regcomp.c
	ext/standard/basic_functions.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	win32/registry.c
2015-03-17 22:04:39 -07:00
..
config.h bump year 2015-01-15 23:27:30 +08:00
mkstemp.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
php_zip_config.w32.h trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_add_dir.c bump year 2015-01-15 23:27:30 +08:00
zip_add_entry.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_add.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_close.c bump year 2015-01-15 23:27:30 +08:00
zip_delete.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_dir_add.c bump year 2015-01-15 23:27:30 +08:00
zip_dirent.c Merge branch 'PHP-5.6' 2015-03-17 22:04:39 -07:00
zip_discard.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_entry.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_err_str.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_error_clear.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_error_get_sys_type.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_error_get.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_error_strerror.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_error_to_str.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_error.c bump year 2015-01-15 23:27:30 +08:00
zip_extra_field_api.c bump year 2015-01-15 23:27:30 +08:00
zip_extra_field.c bump year 2015-01-15 23:27:30 +08:00
zip_fclose.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_fdopen.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_add.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_error_clear.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_error_get.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_get_comment.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_get_external_attributes.c Remove the unused vars 2015-03-04 09:52:09 +08:00
zip_file_get_offset.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_rename.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_replace.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_set_comment.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_set_external_attributes.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_file_strerror.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_filerange_crc.c bump year 2015-01-15 23:27:30 +08:00
zip_fopen_encrypted.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_fopen_index_encrypted.c bump year 2015-01-15 23:27:30 +08:00
zip_fopen_index.c bump year 2015-01-15 23:27:30 +08:00
zip_fopen.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_fread.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_archive_comment.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_archive_flag.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_compression_implementation.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_encryption_implementation.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_file_comment.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_name.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_num_entries.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_get_num_files.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_memdup.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_name_locate.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_new.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_open.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_rename.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_replace.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_set_archive_comment.c bump year 2015-01-15 23:27:30 +08:00
zip_set_archive_flag.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_set_default_password.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_set_file_comment.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_set_file_compression.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_set_name.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_buffer.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_close.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_crc.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_deflate.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_error.c bump year 2015-01-15 23:27:30 +08:00
zip_source_file.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_filep.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_free.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_function.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_layered.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_open.c bump year 2015-01-15 23:27:30 +08:00
zip_source_pkware.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_pop.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_read.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_stat.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_window.c bump year 2015-01-15 23:27:30 +08:00
zip_source_zip_new.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_source_zip.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_stat_index.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_stat_init.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_stat.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_strerror.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_string.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_unchange_all.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_unchange_archive.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_unchange_data.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_unchange.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip_utf-8.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
zip.h trailing whitespace removal 2015-01-10 15:07:38 -08:00
zipconf.h trailing whitespace removal 2015-01-10 15:07:38 -08:00
zipint.h bump year 2015-01-15 23:27:30 +08:00