From: Christoph M. Becker Date: Thu, 19 Nov 2020 15:26:14 +0000 (+0100) Subject: Merge branch 'PHP-7.4' into PHP-8.0 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e27bb86823313616cf5abd04249e0505d5453d8;p=php Merge branch 'PHP-7.4' into PHP-8.0 * PHP-7.4: Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION --- 2e27bb86823313616cf5abd04249e0505d5453d8 diff --cc NEWS index 7719b37889,1bb1c0a757..858fd562e5 --- a/NEWS +++ b/NEWS @@@ -1,20 -1,143 +1,23 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? ????, PHP 7.4.14 +?? ??? ????, PHP 8.0.1RC1 + - Core: - . Fixed bug #74558 (Can't rebind closure returned by Closure::fromCallable()). - (cmb) + . Fixed bug #80345 (PHPIZE configuration has outdated PHP_RELEASE_VERSION). + (cmb) -26 Nov 2020, PHP 7.4.13 +26 Nov 2020, PHP 8.0.0 -- Core: - . Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date). - (cmb) - . Fixed bug #80258 (Windows Deduplication Enabled, randon permission errors). - (cmb) +- BZ2: + . Fixed bug #71263 (fread() does not report bzip2.decompress errors). (cmb) + +- CLI: + . Allow debug server binding to an ephemeral port via `-S localhost:0`. (Sara) - COM: + . Fixed bug #55847 (DOTNET .NET 4.0 GAC new location). (cmb) . Fixed bug #62474 (com_event_sink crashes on certain arguments). (cmb) -- DOM: - . Fixed bug #80268 (loadHTML() truncates at NUL bytes). (cmb) - -- FFI: - . Fixed bug #79177 (FFI doesn't handle well PHP exceptions within callback). - (cmb, Dmitry, Nikita) - -- IMAP: - . Fixed bug #64076 (imap_sort() does not return FALSE on failure). (cmb) - . Fixed bug #76618 (segfault on imap_reopen). (girgias) - . Fixed bug #80239 (imap_rfc822_write_address() leaks memory). (cmb) - . Fixed minor regression caused by fixing bug #80220. (cmb) - . Fixed bug #80242 (imap_mail_compose() segfaults for multipart with rfc822). - (cmb) - -- MySQLi: - . Fixed bug #79375 (mysqli_store_result does not report error from lock wait - timeout). (Kamil Tekiela, Nikita) - . Fixed bug #76525 (mysqli::commit does not throw if MYSQLI_REPORT_ERROR - enabled and mysqlnd used). (Kamil Tekiela) - . Fixed bug #72413 (mysqlnd segfault (fetch_row second parameter - typemismatch)). (Kamil Tekiela) - -- ODBC: - . Fixed bug #44618 (Fetching may rely on uninitialized data). (cmb) - -- Opcache: - . Fixed bug #79643 (PHP with Opcache crashes when a file with specific name - is included). (twosee) - . Fixed run-time binding of preloaded dynamically declared function. (Dmitry) - -- OpenSSL: - . Fixed bug #79983 (openssl_encrypt / openssl_decrypt fail with OCB mode). - (Nikita) - -- PDO MySQL: - . Fixed bug #66528 (No PDOException or errorCode if database becomes - unavailable before PDO::commit). (Nikita) - . Fixed bug #65825 (PDOStatement::fetch() does not throw exception on broken - server connection). (Nikita) - -- SNMP: - . Fixed bug #70461 (disable md5 code when it is not supported in net-snmp). - (Alexander Bergmann, cmb) - -- Standard: - . Fixed bug #80266 (parse_url silently drops port number 0). (cmb, Nikita) - -29 Oct 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) - . Fixed bug #80186 (Segfault when iterating over FFI object). (Nikita) - -- Calendar: - . Fixed bug #80185 (jdtounix() fails after 2037). (cmb) - -- IMAP: - . Fixed bug #80213 (imap_mail_compose() segfaults on certain $bodies). (cmb) - . Fixed bug #80215 (imap_mail_compose() may modify by-val parameters). (cmb) - . Fixed bug #80220 (imap_mail_compose() may leak memory). (cmb) - . Fixed bug #80223 (imap_mail_compose() leaks envelope on malformed bodies). - (cmb) - . Fixed bug #80216 (imap_mail_compose() does not validate types/encodings). - (cmb) - . Fixed bug #80226 (imap_sort() leaks sortpgm memory). (cmb) - -- MySQLnd: - . Fixed bug #80115 (mysqlnd.debug doesn't recognize absolute paths with - slashes). (cmb) - . Fixed bug #80107 (mysqli_query() fails for ~16 MB long query when - compression is enabled). (Nikita) - -- ODBC: - . Fixed bug #78470 (odbc_specialcolumns() no longer accepts $nullable). (cmb) - . Fixed bug #80147 (BINARY strings may not be properly zero-terminated). - (cmb) - . Fixed bug #80150 (Failure to fetch error message). (cmb) - . Fixed bug #80152 (odbc_execute() moves internal pointer of $params). (cmb) - . Fixed bug #46050 (odbc_next_result corrupts prepared resource). (cmb) - -- OPcache: - . Fixed bug #80083 (Optimizer pass 6 removes variables used for ibm_db2 data - binding). (Nikita) - . Fixed bug #80194 (Assertion failure during block assembly of unreachable - free with leading nop). (Nikita) - -- PCRE: - . Updated to PCRE 10.35. (cmb) - . Fixed bug #80118 (Erroneous whitespace match with JIT only). (cmb) - -- PDO_ODBC: - . Fixed bug #67465 (NULL Pointer dereference in odbc_handle_preparer). (cmb) - -- Standard: - . Fixed bug #80114 (parse_url does not accept URLs with port 0). (cmb, twosee) - . Fixed bug #76943 (Inconsistent stream_wrapper_restore() errors). (cmb) - . Fixed bug #76735 (Incorrect message in fopen on invalid mode). (cmb) - -- Tidy: - . Fixed bug #77040 (tidyNode::isHtml() is completely broken). (cmb) - -01 Oct 2020, PHP 7.4.11 - -- Core: - . Fixed bug #79979 (passing value to by-ref param via CUFA crashes). (cmb, - Nikita) - . Fixed bug #80037 (Typed property must not be accessed before initialization - when __get() declared). (Nikita) - . Fixed bug #80048 (Bug #69100 has not been fixed for Windows). (cmb) - . Fixed bug #80049 (Memleak when coercing integers to string via variadic - argument). (Nikita) - . Fixed bug #79699 (PHP parses encoded cookie names so malicious `__Host-` - cookies can be sent). (CVE-2020-7070) (Stas) - - Calendar: . Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing). (Andy Postnikov) diff --cc win32/build/confutils.js index 857e50acbe,68894fa076..bf88cdae44 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@@ -92,12 -94,14 +92,14 @@@ if (typeof(CWD) == "undefined") CWD = FSO.GetParentFolderName(FSO.GetParentFolderName(FSO.GetAbsolutePathName("main\\php_version.h"))); } - /* defaults; we pick up the precise versions from configure.ac */ - var PHP_VERSION = 8; - var PHP_MINOR_VERSION = 0; - var PHP_RELEASE_VERSION = 0; - var PHP_EXTRA_VERSION = ""; - var PHP_VERSION_STRING = "8.0.0"; + if (!MODE_PHPIZE) { + /* defaults; we pick up the precise versions from configure.ac */ - var PHP_VERSION = 7; - var PHP_MINOR_VERSION = 4; ++ var PHP_VERSION = 8; ++ var PHP_MINOR_VERSION = 0; + var PHP_RELEASE_VERSION = 0; + var PHP_EXTRA_VERSION = ""; - var PHP_VERSION_STRING = "7.4.0"; ++ var PHP_VERSION_STRING = "8.0.0"; + } /* Get version numbers and DEFINE as a string */ function get_version_numbers() @@@ -2334,8 -2342,10 +2336,10 @@@ function generate_phpize( MF.WriteLine("var PHP_VERSION=" + PHP_VERSION); MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION); MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION); + MF.WriteLine("var PHP_EXTRA_VERSION=\"" + PHP_EXTRA_VERSION + "\""); + MF.WriteLine("var PHP_VERSION_STRING=\"" + PHP_VERSION_STRING + "\""); MF.WriteBlankLines(1); - MF.WriteLine("/* Genereted extensions list with mode (static/shared) */"); + MF.WriteLine("/* Generated extensions list with mode (static/shared) */"); var count = extensions_enabled.length; for (i in extensions_enabled) {