summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-08-05 23:09:30 +0200
committerNikita Popov <nikic@php.net>2016-08-05 23:09:30 +0200
commita2a2ea18feea8945be7a7f02f384f015fa47076a (patch)
tree72a46086bcc5ff500ab8e03f235d5db8a1816e8d /NEWS
parent807e81937b290ddb71152196aae3bbaca9a53c7e (diff)
parent65056e9d6c74adef89332080b5458fd4850fb3b7 (diff)
downloadphp-git-a2a2ea18feea8945be7a7f02f384f015fa47076a.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts: ext/standard/ftp_fopen_wrapper.c
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 623f31e200..3be4c9bb99 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP NEWS
- Session:
. Fixed bug #72724 (PHP7: session-uploadprogress kills httpd). (Nikita)
+- Streams:
+ . Fixed bug #72764 (ftps:// opendir wrapper data channel encryption fails
+ with IIS FTP 7.5, 8.5). (vhuk)
+
?? ??? 2016 PHP 7.0.10