Author: Mark Randall Committer: Derick Rethans (derickr) Date: 2026-06-18T13:15:38+01:00
Commit: https://github.com/php/web-php/commit/28078567afec2229890227c11c0c5bac4d27a019 Raw diff: https://github.com/php/web-php/commit/28078567afec2229890227c11c0c5bac4d27a019.diff Repair ChangeLogs that got caught up in find/replace of include_once -> require_once Changed paths: M public/ChangeLog-4.php M public/ChangeLog-5.php Diff: diff --git a/public/ChangeLog-4.php b/public/ChangeLog-4.php index 5b067b5ec6..d545b278f1 100644 --- a/public/ChangeLog-4.php +++ b/public/ChangeLog-4.php @@ -2873,7 +2873,7 @@ functions (Stas)</li> <li>Fixed mSQL_close(). ([email protected])</li> <li>Made return() in a require()'d file work like return() in an include()'d file (Andi & Zeev, Zend Engine)</li> -<li>Changed require_once() to work using the same table as require_once() +<li>Changed require_once() to work using the same table as include_once() (Andi & Zeev, Zend Engine)</li> <li>Fixed PostgreSQL module to work when the link handle is omitted (Zeev)</li> <li>Fixed the Sybase modules to work properly with PHP 4.0 (Zeev)</li> @@ -3075,7 +3075,7 @@ functions. (Sterling)</li> <li>Fixed stripcslashes() to remove to strip \ in unknown escapes instead of leaving it. (Andrei)</li> <li>Changed WDDX to always serialize arrays as structs. (Andrei)</li> -<li>Fixed require_once() to issue a warning in case the supplied file name is +<li>Fixed include_once() to issue a warning in case the supplied file name is not found (Zeev, Zend Engine)</li> <li>Fixed a bug in get_declared_classes() which could return the same class multiple times under certain circumstances (Zeev, Zend Engine)</li> @@ -3240,7 +3240,7 @@ functionality and stability of multi-threaded versions of PHP (Andi, Sascha)</li <li>Fixed several problems with the PATH_TRANSLATED and PHP_SELF under Apache (Paul Gregg & Zeev)</li> <li>Ported ldap_get_values_len() function from PHP3 to PHP4. (Sterling)</li> -<li>Fixed a problem in require_once() with non constant arguments (Andi & Zeev, +<li>Fixed a problem in include_once() with non constant arguments (Andi & Zeev, Zend Engine)</li> <li>Added php.ini-optimized (Zeev)</li> <li>Ported ldap_errno(), ldap_err2str() and ldap_error() from PHP3 to PHP4. @@ -3332,7 +3332,7 @@ functionality and stability of multi-threaded versions of PHP (Andi, Sascha)</li easy reuse of configuration options (Sascha)</li> <li>Added support for embedded MySQL client library. Unless you specify a path to --with-mysql, the bundled MySQL client library will be used (Sascha)</li> -<li>Added require_once() and require_once() functionality (Andi, Zend Engine)</li> +<li>Added include_once() and require_once() functionality (Andi, Zend Engine)</li> <li>Removed support for pdflib < 3.0 (Uwe)</li> <li>Added auto-registration of everything in $HTTP_SESSION_VARS[] if register_globals is turned off. (Andrei)</li> diff --git a/public/ChangeLog-5.php b/public/ChangeLog-5.php index fac7b0e029..be68f79c2b 100644 --- a/public/ChangeLog-5.php +++ b/public/ChangeLog-5.php @@ -11001,7 +11001,7 @@ class members or constants. (Matt)</li> (Dmitry, Pierre)</li> <li>Changed exception handling. Now each op_array doesn't contain ZEND_HANDLE_EXCEPTION opcode in the end. (Dmitry)</li> - <li>Optimized require_once() and require_once() by eliminating fopen(3) on + <li>Optimized require_once() and include_once() by eliminating fopen(3) on second usage. (Dmitry)</li> <li>Optimized ZEND_FETCH_CLASS + ZEND_ADD_INTERFACE into single ZEND_ADD_INTERFACE opcode. (Dmitry)</li> @@ -11424,7 +11424,7 @@ class members or constants. (Matt)</li> (Matteo)</li> <li><?php bugfix(47771); ?> (Exception during object construction from arg call calls object's destructor). (Dmitry)</li> - <li><?php bugfix(47767); ?> (require_once does not resolve windows symlinks or junctions) + <li><?php bugfix(47767); ?> (include_once does not resolve windows symlinks or junctions) (Kanwaljeet Singla, Venkat Raman Don)</li> <li><?php bugfix(47757); ?> (rename JPG to JPEG in phpinfo). (Pierre)</li> <li><?php bugfix(47745); ?> (FILTER_VALIDATE_INT doesn't allow minimum integer). (Dmitry)</li> @@ -13390,7 +13390,7 @@ class members or constants. (Matt)</li> <li>Optimized array/HashTable copying. (Matt Wilmas, Dmitry)</li> <li>Optimized zend_try/zend_catch macros by eliminating memcpy(3). (Dmitry)</li> -<li>Optimized require_once() and require_once() by eliminating fopen(3) on second usage. (Dmitry)</li> +<li>Optimized require_once() and include_once() by eliminating fopen(3) on second usage. (Dmitry)</li> <li>Optimized request shutdown sequence. Restoring ini directives now iterates only over modified directives instead of all. (Dmitry)</li> <li>Changed priority of PHPRC environment variable on win32 to be higher then value from registry. (Dmitry)</li> @@ -13540,7 +13540,7 @@ class members or constants. (Matt)</li> <li><?php bugfix(38637); ?> curl_copy_handle() fails to fully copy the cURL handle). (Tony, Ilia)</li> <li><?php bugfix(38624); ?> Strange warning when incrementing an object property and exception is thrown from __get method). (Tony)</li> <li><?php bugfix(38623); ?> leaks in a tricky code with switch() and exceptions). (Dmitry)</li> -<li><?php bugfix(38579); ?> require_once() may include the same file twice). (Dmitry)</li> +<li><?php bugfix(38579); ?> include_once() may include the same file twice). (Dmitry)</li> <li><?php bugfix(38574); ?> missing curl constants and improper constant detection). (Ilia)</li> <li><?php bugfix(38543); ?> shutdown_executor() may segfault when memory_limit is too low). (Dmitry)</li> <li><?php bugfix(38535); ?> memory corruption in pdo_pgsql driver on error retrieval inside a failed query executed via query() method). (Ilia)</li> @@ -14508,7 +14508,7 @@ class members or constants. (Matt)</li> <li><?php bugfix(32933); ?> (Cannot extend class "SQLiteDatabase"). (Marcus)</li> <li><?php bugfix(32932); ?> (Oracle LDAP: ldap_get_entries(), invalid pointer). (Jani)</li> <li><?php bugfix(32930); ?> (class extending DOMDocument doesn't clone properly). (Rob)</li> -<li><?php bugfix(32924); ?> (file included with "auto_prepend_file" can be included with require_once() or require_once()). (Stas)</li> +<li><?php bugfix(32924); ?> (file included with "auto_prepend_file" can be included with require_once() or include_once()). (Stas)</li> <li><?php bugfix(32904); ?> (pg_get_notify() ignores result_type parameter). (Tony)</li> <li><?php bugfix(32852); ?> (Crash with singleton and __destruct when zend.ze1_compatibility_mode = On). (Dmitry)</li> <li><?php bugfix(32833); ?> (Invalid opcode). (Dmitry)</li> @@ -15695,7 +15695,7 @@ function by using parent::__clone(). (Zeev, Andi)</li> <li>Changed rename(), rmdir() and mkdir() to be routed via streams API. (Sara)</li> <li>Changed stat() and family to be routed via streams API. (Sara)</li> -<li>Fixed require_once() / require_once() on Windows to honor +<li>Fixed include_once() / require_once() on Windows to honor case-insensitivity; of files. (Andi)</li> <li>Fixed get_declared_classes() to return only classes. (Andrey, Marcus)</li>
