Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80185: jdtounix() fails after 2037

diff --cc NEWS
index 8d02664ab7169517dbbff356f6563579e5e9b1f4,c7e278e3cd97c41979b4607a63e7d2433fa83795..85110a9f508a38cdff916e9fbdd96780d0a57bb3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,14 +1,17 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.24
 +?? ??? 2020, PHP 7.4.12
  
  - Core:
 +  . Fixed bug #80061 (Copying large files may have suboptimal performance).
 +    (cmb)
    . Fixed bug #79423 (copy command is limited to size of file it can copy).
      (cmb)
 +  . Fixed bug #80126 (Covariant return types failing compilation). (Nikita)
  
+ - Calendar:
+   . Fixed bug #80185 (jdtounix() fails after 2037). (cmb)
+ 
  - MySQLnd:
    . Fixed bug #80115 (mysqlnd.debug doesn't recognize absolute paths with
      slashes). (cmb)

diff --cc ext/calendar/cal_unix.c
index 1807b7d2a6d0f0efb373ca9ab74ea654ec7cd948,d364079bd047449d69f5fac67024f31f3044d35b..864499c9cc3628699df8a7165c3bb972c418f8c7
--- 1/ext/calendar/cal_unix.c
--- 2/ext/calendar/cal_unix.c
+++ b/ext/calendar/cal_unix.c
@@@ -66,6 -68,15 +68,6 @@@ PHP_FUNCTION(jdtounix
                RETURN_FALSE;
        }
  
-       RETURN_LONG(uday * 24 * 3600);
+       RETURN_LONG(uday * SECS_PER_DAY);
  }
  /* }}} */
 -
 -/*
 - * Local variables:
 - * tab-width: 4
 - * c-basic-offset: 4
 - * End:
 - * vim600: sw=4 ts=4 fdm=marker
 - * vim<600: sw=4 ts=4
 - */