clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
72ac8cf5ad
php-src/main
History
Stanislav Malyshev 4d0565b5ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix #72519, possible OOB using imagegif
  fix #72512, invalid read or write for palette image when invalid transparent index is used
  Apparently some envs miss SIZE_MAX
  Fix tests
  Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
  Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
  Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
  Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
  Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
  Fix bug #72562 - destroy var_hash properly
  Fix bug #72533 (locale_accept_from_http out-of-bounds access)
  Fix fir bug #72520
  Fix for bug #72513
  CS fix and comments with bug ID
  Fix for HTTP_PROXY issue.
  add tests for bug #72512
  Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
  Fixed bug #72479 - same as #72434

Conflicts:
	ext/bz2/bz2.c
	main/SAPI.c
	main/php_variables.c
2016-07-19 00:53:08 -07:00
..
streams Fixed bug #72439 (Stream socket with remote address leads to a segmentation fault) 2016-06-18 21:29:47 -07:00
alloca.c
build-defs.h.in Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
fopen_wrappers.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
fopen_wrappers.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
getopt.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
internal_functions_nw.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
internal_functions_win32.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
internal_functions.c.in Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
main.c Bug #71596 Segmentation fault on ZTS with date function (setlocale) 2016-02-18 19:13:07 +01:00
mergesort.c
network.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
output.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_compat.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_content_types.c Fix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA) 2016-06-20 18:43:07 +02:00
php_content_types.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_getopt.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_globals.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_ini.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_ini.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_main.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_memory_streams.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_network.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_open_temporary_file.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_open_temporary_file.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_output.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_reentrancy.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_scandir.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_scandir.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_sprintf.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_stdint.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_streams.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_syslog.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_ticks.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_ticks.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_variables.c Merge branch 'PHP-5.5' into PHP-5.6 2016-07-19 00:53:08 -07:00
php_variables.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
php_version.h 5.6.25 is next 2016-07-07 00:09:48 +02:00
php.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
reentrancy.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
rfc1867.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
rfc1867.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
SAPI.c Merge branch 'PHP-5.5' into PHP-5.6 2016-07-19 00:53:08 -07:00
SAPI.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
snprintf.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
snprintf.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
spprintf.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
spprintf.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
strlcat.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
strlcpy.c Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
win32_internal_function_disabled.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
win95nt.h Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00