php-src/sapi
Stanislav Malyshev 5776fceb16 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
2015-04-14 01:05:01 -07:00
..
aolserver bump year 2015-01-15 23:26:37 +08:00
apache bump year 2015-01-15 23:26:37 +08:00
apache2filter bump year 2015-01-15 23:26:37 +08:00
apache2handler Merge branch 'PHP-5.4.40' into PHP-5.5.24 2015-04-11 16:56:12 -07:00
apache_hooks bump year 2015-01-15 23:26:37 +08:00
caudium bump year 2015-01-15 23:26:37 +08:00
cgi Shut up, my lovely compiler; I do not like your warnings 2015-02-09 11:23:35 +08:00
cli Fixed bug #67741 (auto_prepend_file messes up __LINE__) 2015-03-03 11:43:23 +08:00
continuity bump year 2015-01-15 23:26:37 +08:00
embed bump year 2015-01-15 23:26:37 +08:00
fpm Merge branch 'pull-request/995' into PHP-5.5 2015-02-16 15:20:39 +03:00
isapi bump year 2015-01-15 23:26:37 +08:00
litespeed Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25 11:24:19 -05:00
milter bump year 2015-01-15 23:26:37 +08:00
nsapi bump year 2015-01-15 23:26:37 +08:00
phpdbg bump year 2015-01-15 23:26:37 +08:00
phttpd bump year 2015-01-15 23:26:37 +08:00
pi3web bump year 2015-01-15 23:26:37 +08:00
roxen bump year 2015-01-15 23:26:37 +08:00
tests Revert previous unintentional change to this 2015-01-27 22:19:11 +08:00
thttpd bump year 2015-01-15 23:26:37 +08:00
tux bump year 2015-01-15 23:26:37 +08:00
webjames bump year 2015-01-15 23:26:37 +08:00