Catch up with recent changes [ci skip]

- RFC about password_hash portability improvements added
- build system minor updates noted
- typos

3 files changed, 22 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 2cdac0aa99..5b8968475e 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,9 @@ PHP                                                                        NEWS
   . Fixed #78208 (password_needs_rehash() with an unknown algo should always
     return true). (Sara)
   . Fixed #78241 (touch() does not handle dates after 2038 in PHP 64-bit). (cmb)
+  . Implemented RFC where password_hash() has argon2i(d) implementations from
+    ext/sodium when PHP is built without libargon:
+    https://wiki.php.net/rfc/sodium.argon.hash (Sara)
 
 27 Jun 2019, PHP 7.4.0alpha2
 
diff --git a/UPGRADING b/UPGRADING
index 6a1a6a7d9f..7cbf3a31b7 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -268,7 +268,7 @@ PHP 7.4 UPGRADE NOTES
   . PDO::setAttribute(PDO::SQLITE_ATTR_EXTENDED_RESULT_CODES, true) enables the
     use of SQLite3 extended result codes in errorInfo().
 
-r SQLite3:
+- SQLite3:
   . Added SQLite3::lastExtendedErrorCode() to fetch the last extended result
     code.
   . Added SQLite3::enableExtendedResultCodes($enable = true), which will make
@@ -302,6 +302,11 @@ r SQLite3:
 
         proc_open(['php', '-r', 'echo "Hello World\n";'], $descriptors, $pipes);
 
+  . password_hash() has argon2i(d) implementations from ext/sodium when PHP is
+    built without libargon.
+
+    RFC: https://wiki.php.net/rfc/sodium.argon.hash
+
 ========================================
 3. Changes in SAPI modules
 ========================================
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index f00b1003d2..b3d5e1d6a2 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -23,6 +23,7 @@ PHP 7.4 INTERNALS UPGRADE NOTES
   t. Exceptions thrown by string conversions.
   u. Removed uint and ulong typedefs
   v. Compound assignment opcodes
+  z. APACHE symbol removed
 
 2. Build system changes
   a. Abstract
@@ -219,6 +220,7 @@ PHP 7.4 INTERNALS UPGRADE NOTES
      ZEND_ASSIGN_DIM_OP, ZEND_ASSIGN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP with
      ZEND_ADD (or other) in extended_value.
 
+  z. APACHE symbol has been removed and is no longer defined.
 
 ========================
 2. Build system changes
@@ -278,10 +280,19 @@ PHP 7.4 INTERNALS UPGRADE NOTES
       HAVE_STDLIB_H, HAVE_SYS_VARARGS_H, HAVE_ASSERT_H, HAVE_SYS_DIR_H,
       TM_IN_SYS_TIME, HAVE_STRTOD, HAVE_STRCOLL, HAVE_ERRNO_H, HAVE_MEMCPY,
       HAVE_SNPRINTF, HAVE_STDIO_H, HAVE_STRPBRK, HAVE_TIME_H, HAVE_LIMITS_H,
-      HAVE_STRTOUL, HAVE_SYS_NDIR_H, HAVE_SYS_TIMES_H, PHP_HAVE_STDINT_TYPES.
+      HAVE_STRTOUL, HAVE_SYS_NDIR_H, HAVE_SYS_TIMES_H, PHP_HAVE_STDINT_TYPES,
+      HAVE_SIGNAL_H, HAVE_STRERROR.
     - Removed unused check for dev/arandom and the HAVE_DEV_ARANDOM symbol.
     - Remove unused functions checks: HAVE_MBSINIT, HAVE_MEMPCPY, HAVE_SETPGID,
-      HAVE_STRPNCPY, HAVE_STRTOULL, and HAVE_VSNPRINTF.
+      HAVE_STRPNCPY, HAVE_STRTOULL, HAVE_VSNPRINTF, HAVE_CUSERID, HAVE_LRAND48,
+      HAVE_RANDOM, HAVE_SRAND48, HAVE_SRANDOM, HAVE_STRDUP.
+    - Unused check for struct cmsghdr and symbol HAVE_CMSGHDR have been removed.
+    - Unused ApplicationServices/ApplicationServices.h headers check and
+      HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H symbol have been removed.
+    - PHP_DEBUG_MACRO macro has been removed.
+    - PHP_CHECK_CONFIGURE_OPTIONS macro has been removed. Default Autoconf's
+      --enable-option-checking=fatal option can be used in the configure step
+      to enable error when invalid options are used.
 
   c. Windows build system changes