delta/php-git.git/sapi, branch php-5.6.8 git.php.net: repository/php-src.git Merge branch 'PHP-5.5' into PHP-5.6 2015-04-15T16:20:03+00:00 Stanislav Malyshev stas@php.net 2015-04-14T07:51:14+00:00 dc87efa848a5355e0f83060ff2cbb37cbaaf6805 * 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 
* 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
Fixed bug #67741 (auto_prepend_file messes up __LINE__) 2015-03-03T03:43:23+00:00 Reeze Xia reeze@php.net 2015-03-03T03:25:30+00:00 4e2c87edb34c4f151da6899d523c93b8e8565975 This also fixes bug #54081 
This also fixes bug #54081
Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25T16:24:19+00:00 George Wang gwang@php.net 2015-02-25T15:48:19+00:00 65810bf2596f3d03ec7baf0c5de01235c8ee7e35 






Merge branch 'pull-request/995' into PHP-5.6
2015-02-16T12:15:11+00:00

Antony Dovgal
tony2001@php.net

2015-02-16T12:15:11+00:00

c4664d173160c967a31234e7ba79516ba847ef1e

* pull-request/995:
  fix bug #68822 (request time is reset too early)





* pull-request/995:
  fix bug #68822 (request time is reset too early)







fix bug #68822 (request time is reset too early)
2015-02-16T12:10:09+00:00

redfoxli
honghu069@163.com

2015-01-13T05:59:24+00:00

3664345abac75aabedfbca061b0b7db5915de085

this caused wrong time in the logs





this caused wrong time in the logs







Fixed #68790 (Missing return)
2015-02-07T17:19:53+00:00

George Wang
gwang@php.net

2015-02-07T17:16:54+00:00

c90cd09331c193ee34794ca1a73e821c31be2d1f












Merge branch 'PHP-5.5' into PHP-5.6
2015-02-01T08:36:21+00:00

Stanislav Malyshev
stas@php.net

2015-02-01T08:35:41+00:00

ac3a4e420036d125bc2f3e8ecba42de49ae3a65f

* PHP-5.5:
  Fix #66479: Wrong response to FCGI_GET_VALUES





* PHP-5.5:
  Fix #66479: Wrong response to FCGI_GET_VALUES







Fix #66479: Wrong response to FCGI_GET_VALUES
2015-02-01T08:35:23+00:00

Frank Stolle
f.stolle@hosting-agency.de

2014-10-30T12:07:04+00:00

6a905a9a3cae60ffb22f7472d9fa977e54c24d5d

Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.

Conflicts:
	sapi/cgi/fastcgi.c





Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.

Conflicts:
	sapi/cgi/fastcgi.c







Merge branch 'PHP-5.5' into PHP-5.6
2015-02-01T05:48:40+00:00

Stanislav Malyshev
stas@php.net

2015-02-01T05:48:40+00:00

6a960b6d1b2b3cdbce7d6faf9e58087297a45887

* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset





* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset







Merge branch 'PHP-5.4' into PHP-5.5
2015-02-01T05:48:14+00:00

Stanislav Malyshev
stas@php.net

2015-02-01T05:47:22+00:00

af1f867308ca68e82a2143f62ecd7a6f7b19ba2a

* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset





* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset