delta/php-git.git/ext/zlib, branch php-5.6.13 git.php.net: repository/php-src.git Merge branch 'PHP-5.5' into PHP-5.6 2015-04-14T08:05:01+00:00 Stanislav Malyshev stas@php.net 2015-04-14T07:51:14+00:00 5776fceb16597d9ce686a01c1b72eac155b9741b * 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
Merge branch 'PHP-5.4.40' into PHP-5.5.24 2015-04-13T06:49:16+00:00 Stanislav Malyshev stas@php.net 2015-04-13T06:49:16+00:00 ba15e8dfd0bbe65fd7022f55cf5bdaca413d96e4 * PHP-5.4.40: fix memory leak & add test Fix tests 
* PHP-5.4.40:
  fix memory leak & add test
  Fix tests
Fix tests 2015-04-13T03:55:35+00:00 Stanislav Malyshev stas@php.net 2015-04-13T03:53:09+00:00 a643ccfb90750e0d830106588d2a46af87706b5b 






Merge branch 'PHP-5.4.40' into PHP-5.5.24
2015-04-11T23:56:12+00:00

Stanislav Malyshev
stas@php.net

2015-04-11T23:56:12+00:00

0cb9d75cb6dfea4ad31ea794856489854ff20e16

* PHP-5.4.40:
  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)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.





* PHP-5.4.40:
  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)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.







Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
2015-04-11T23:53:22+00:00

Stanislav Malyshev
stas@php.net

2015-04-05T23:01:24+00:00

4435b9142ff9813845d5c97ab29a5d637bedb257












Merge branch 'PHP-5.5' into PHP-5.6
2015-02-13T05:12:44+00:00

Xinchen Hui
laruence@php.net

2015-02-13T05:12:44+00:00

adc42657922be5da0e7fe5ac53027c6c4960ae3e












Micro opt
2015-02-13T05:09:56+00:00

Xinchen Hui
laruence@php.net

2015-02-13T05:09:56+00:00

3a71fa36a230d1908d71a98086ab7c6fa9519530












bump year
2015-01-15T15:26:37+00:00

Xinchen Hui
laruence@php.net

2015-01-15T15:26:37+00:00

0579e8278dad43c7ebc070468b56caddf1c660b8












Bump year
2015-01-15T15:26:03+00:00

Xinchen Hui
laruence@php.net

2015-01-15T15:09:28+00:00

73c1be26531f730d64d61962b56eaf28ce3fc6aa












Merge branch 'PHP-5.5' into PHP-5.6
2014-11-26T23:13:11+00:00

Ferenc Kovacs
tyrael@php.net

2014-11-26T23:13:11+00:00

fcf21c4d00453f90b69894f1131ae505d92696ee

* PHP-5.5:
  the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
  5.5.21 now

Conflicts:
	configure.in
	main/php_version.h





* PHP-5.5:
  the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
  5.5.21 now

Conflicts:
	configure.in
	main/php_version.h