summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-04-28 17:08:03 +0200
committerAnatol Belski <ab@php.net>2015-04-28 17:08:03 +0200
commit27a6ab5bc515cfdad68b5e2ada7bb146b1f86a84 (patch)
treed1d0e05f016d1c2ae4915e715a941206bebf6dfe
parent54f016ad77c472ac8b3324e6a414840aaf982850 (diff)
downloadphp-git-27a6ab5bc515cfdad68b5e2ada7bb146b1f86a84.tar.gz
updated NEWS and fixed a typo
-rw-r--r--NEWS3
-rw-r--r--UPGRADING2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e5c60d1fe5..8216814748 100644
--- a/NEWS
+++ b/NEWS
@@ -119,6 +119,9 @@
. Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes). (Chris Wright)
. Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)
+- FTP:
+ . Fixed bug #69082 FTPS support on Windows
+
- Intl:
. Removed deprecated aliases datefmt_set_timezone_id() and
IntlDateFormatter::setTimeZoneID(). (Nikita)
diff --git a/UPGRADING b/UPGRADING
index c85d18e32f..121e124f34 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -659,7 +659,7 @@ For more details see https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts
- ftp
. The ftp extension is always shipped shared
. For SSL support, the dependency on the openssl extension was abolished. Instead
- it depends alone on the openssl library. If it's presend at the compile time,
+ it depends alone on the openssl library. If it's present at the compile time,
ftp_ssl_connect() is enabled automatically.
- odbc