updated NEWS and fixed a typo

diff --git a/NEWS b/NEWS
index e5c60d1fe59ebe53979914707783bf1708638cce..8216814748317f0f169ae8b9bb0d8fe273cac99c 100644 (file)
--- 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 c85d18e32fe00ae6ed4f794c5a5f4591d4539dfe..121e124f34a9492917cb49f00e73b9ee6552746c 100644 (file)
--- 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