delta/php-git.git/sapi/apache2handler/sapi_apache2.c, 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
bump year 2015-01-15T15:26:37+00:00 Xinchen Hui laruence@php.net 2015-01-15T15:26:37+00:00 0579e8278dad43c7ebc070468b56caddf1c660b8 






Merge branch 'PHP-5.5' into PHP-5.6
2014-04-13T22:39:32+00:00

Stanislav Malyshev
stas@php.net

2014-04-13T22:38:20+00:00

1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee

* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce





* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce







fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
2014-04-13T22:36:43+00:00

Jeff Trawick
trawick@gmail.com

2014-04-13T20:37:16+00:00

442264ffd6c12eb5278f64ef6554d7fd0780d3fe












Shut up, my lovely compiler; I do not like your warnings
2014-04-11T17:33:56+00:00

Bob Weinand
bobwei9@hotmail.com

2014-04-11T17:33:56+00:00

99d1a1bb3f96364d1ee7bf3e9c84215001200112












Bump year
2014-01-03T03:08:10+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:08:10+00:00

c081ce628f0d76d44784d7bb8e06428b06142ac0












Bump year
2014-01-03T03:04:26+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:04:26+00:00

c0d060f5c02db168f1de895b41afffbc6e3cacfb












Merge branch 'pull-request/341'
2013-06-10T21:30:59+00:00

Stanislav Malyshev
stas@php.net

2013-06-10T21:20:18+00:00

02e4d7a290ae437688b3a3d114621a1d32444560

* pull-request/341: (23 commits)
  typofixes





* pull-request/341: (23 commits)
  typofixes







Merge branch 'pull-request/341'
2013-06-10T21:20:18+00:00

Stanislav Malyshev
stas@php.net

2013-06-10T21:20:18+00:00

ac40c0b562b0f90652cadef83968d7305626c377

* pull-request/341: (23 commits)
  typofixes





* pull-request/341: (23 commits)
  typofixes







Happy New Year
2013-01-01T08:37:09+00:00

Xinchen Hui
laruence@php.net

2013-01-01T08:37:09+00:00

a666285bc2488b7f7362368c388e41428610ad1d