]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Thu, 4 Aug 2016 06:00:32 +0000 (23:00 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 4 Aug 2016 06:00:32 +0000 (23:00 -0700)
commitb57474f23efd419a739408ab7a05e49e831e37ad
tree963599122933b11fd13dfcdb36fff3485e28cc6c
parentdb4211a8fee3079d5b53c6673c75afe41eb6a8f6
parent4f861b60710639557635e9f3cf13bf9cbf8872cd
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #72716 - initialize buffer before read

Conflicts:
ext/standard/ftp_fopen_wrapper.c
ext/standard/ftp_fopen_wrapper.c