delta/php-git.git/ext/pgsql, branch php-5.6.16 git.php.net: repository/php-src.git Merge branch 'PHP-5.5' into PHP-5.6 2015-06-09T07:13:19+00:00 Remi Collet remi@php.net 2015-06-09T07:13:19+00:00 5eecc6bcdee157aa7cb11691755bfd42007ead29 * PHP-5.5: fix test description Fixed Buf #68812 Unchecked return value. 
* PHP-5.5:
  fix test description
  Fixed Buf #68812 Unchecked return value.
fix test description 2015-06-09T07:12:59+00:00 Remi Collet remi@php.net 2015-06-09T07:12:59+00:00 b347f2c47afa4fe1ebda0c97efbf7745577a91fe 






Merge branch 'PHP-5.5' into PHP-5.6
2015-05-20T12:02:25+00:00

Remi Collet
remi@php.net

2015-05-20T12:02:25+00:00

59a78d48f06de10d927987dd0c940bf3c03dd316

* PHP-5.5:
  move test





* PHP-5.5:
  move test







move test
2015-05-20T12:02:13+00:00

Remi Collet
remi@php.net

2015-05-20T12:02:13+00:00

3be4e5d71af3d7f495876fabd5a9ce46580e2d0d












Merge branch 'PHP-5.5' into PHP-5.6
2015-05-20T06:30:44+00:00

Remi Collet
remi@php.net

2015-05-20T06:30:44+00:00

f228bc5230ee7ad6f1a544a031dd3a1fb41c689d

* PHP-5.5:
  fix new test





* PHP-5.5:
  fix new test







fix new test
2015-05-20T06:30:27+00:00

Remi Collet
remi@php.net

2015-05-20T06:30:27+00:00

716fe10d97454b6dfe8b2c1c3e0e3e64369ec92d












Merge branch 'PHP-5.5' into PHP-5.6
2015-05-20T06:11:24+00:00

Remi Collet
remi@php.net

2015-05-20T06:11:24+00:00

e41a2009d613ae7fe8719d1bf99147ff6a570a33

* PHP-5.5:
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)





* PHP-5.5:
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)







Fixed Bug #69667 segfault in php_pgsql_meta_data
2015-05-20T06:08:41+00:00

Remi Collet
remi@php.net

2015-05-20T06:08:41+00:00

2cc4e69cc6d8dbc4b3568ad3dd583324a7c11d64

Incomplete fix for #68741





Incomplete fix for #68741







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-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.