Skip to content

Commit 41cef79

Browse files
markrandallderickr
authored andcommitted
Repair ChangeLogs that got caught up in find/replace of include_once -> require_once
1 parent f02110d commit 41cef79

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

public/ChangeLog-4.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,7 +2873,7 @@ functions (Stas)</li>
28732873
<li>Fixed mSQL_close(). (nick@loman.net)</li>
28742874
<li>Made return() in a require()'d file work like return() in an include()'d
28752875
file (Andi &amp; Zeev, Zend Engine)</li>
2876-
<li>Changed require_once() to work using the same table as require_once()
2876+
<li>Changed require_once() to work using the same table as include_once()
28772877
(Andi &amp; Zeev, Zend Engine)</li>
28782878
<li>Fixed PostgreSQL module to work when the link handle is omitted (Zeev)</li>
28792879
<li>Fixed the Sybase modules to work properly with PHP 4.0 (Zeev)</li>
@@ -3075,7 +3075,7 @@ functions. (Sterling)</li>
30753075
<li>Fixed stripcslashes() to remove to strip \ in unknown escapes instead of
30763076
leaving it. (Andrei)</li>
30773077
<li>Changed WDDX to always serialize arrays as structs. (Andrei)</li>
3078-
<li>Fixed require_once() to issue a warning in case the supplied file name is
3078+
<li>Fixed include_once() to issue a warning in case the supplied file name is
30793079
not found (Zeev, Zend Engine)</li>
30803080
<li>Fixed a bug in get_declared_classes() which could return the same class
30813081
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
32403240
<li>Fixed several problems with the PATH_TRANSLATED and PHP_SELF under Apache
32413241
(Paul Gregg &amp; Zeev)</li>
32423242
<li>Ported ldap_get_values_len() function from PHP3 to PHP4. (Sterling)</li>
3243-
<li>Fixed a problem in require_once() with non constant arguments (Andi &amp; Zeev,
3243+
<li>Fixed a problem in include_once() with non constant arguments (Andi &amp; Zeev,
32443244
Zend Engine)</li>
32453245
<li>Added php.ini-optimized (Zeev)</li>
32463246
<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
33323332
easy reuse of configuration options (Sascha)</li>
33333333
<li>Added support for embedded MySQL client library. Unless you specify a path
33343334
to --with-mysql, the bundled MySQL client library will be used (Sascha)</li>
3335-
<li>Added require_once() and require_once() functionality (Andi, Zend Engine)</li>
3335+
<li>Added include_once() and require_once() functionality (Andi, Zend Engine)</li>
33363336
<li>Removed support for pdflib &lt; 3.0 (Uwe)</li>
33373337
<li>Added auto-registration of everything in $HTTP_SESSION_VARS[] if
33383338
register_globals is turned off. (Andrei)</li>

public/ChangeLog-5.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11001,7 +11001,7 @@ class members or constants. (Matt)</li>
1100111001
(Dmitry, Pierre)</li>
1100211002
<li>Changed exception handling. Now each op_array doesn't contain
1100311003
ZEND_HANDLE_EXCEPTION opcode in the end. (Dmitry)</li>
11004-
<li>Optimized require_once() and require_once() by eliminating fopen(3) on
11004+
<li>Optimized require_once() and include_once() by eliminating fopen(3) on
1100511005
second usage. (Dmitry)</li>
1100611006
<li>Optimized ZEND_FETCH_CLASS + ZEND_ADD_INTERFACE into single
1100711007
ZEND_ADD_INTERFACE opcode. (Dmitry)</li>
@@ -11424,7 +11424,7 @@ class members or constants. (Matt)</li>
1142411424
(Matteo)</li>
1142511425
<li><?php bugfix(47771); ?> (Exception during object construction from arg call calls
1142611426
object's destructor). (Dmitry)</li>
11427-
<li><?php bugfix(47767); ?> (require_once does not resolve windows symlinks or junctions)
11427+
<li><?php bugfix(47767); ?> (include_once does not resolve windows symlinks or junctions)
1142811428
(Kanwaljeet Singla, Venkat Raman Don)</li>
1142911429
<li><?php bugfix(47757); ?> (rename JPG to JPEG in phpinfo). (Pierre)</li>
1143011430
<li><?php bugfix(47745); ?> (FILTER_VALIDATE_INT doesn't allow minimum integer). (Dmitry)</li>
@@ -13390,7 +13390,7 @@ class members or constants. (Matt)</li>
1339013390

1339113391
<li>Optimized array/HashTable copying. (Matt Wilmas, Dmitry)</li>
1339213392
<li>Optimized zend_try/zend_catch macros by eliminating memcpy(3). (Dmitry)</li>
13393-
<li>Optimized require_once() and require_once() by eliminating fopen(3) on second usage. (Dmitry)</li>
13393+
<li>Optimized require_once() and include_once() by eliminating fopen(3) on second usage. (Dmitry)</li>
1339413394
<li>Optimized request shutdown sequence. Restoring ini directives now iterates only over modified directives instead of all. (Dmitry)</li>
1339513395

1339613396
<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>
1354013540
<li><?php bugfix(38637); ?> curl_copy_handle() fails to fully copy the cURL handle). (Tony, Ilia)</li>
1354113541
<li><?php bugfix(38624); ?> Strange warning when incrementing an object property and exception is thrown from __get method). (Tony)</li>
1354213542
<li><?php bugfix(38623); ?> leaks in a tricky code with switch() and exceptions). (Dmitry)</li>
13543-
<li><?php bugfix(38579); ?> require_once() may include the same file twice). (Dmitry)</li>
13543+
<li><?php bugfix(38579); ?> include_once() may include the same file twice). (Dmitry)</li>
1354413544
<li><?php bugfix(38574); ?> missing curl constants and improper constant detection). (Ilia)</li>
1354513545
<li><?php bugfix(38543); ?> shutdown_executor() may segfault when memory_limit is too low). (Dmitry)</li>
1354613546
<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>
1450814508
<li><?php bugfix(32933); ?> (Cannot extend class "SQLiteDatabase"). (Marcus)</li>
1450914509
<li><?php bugfix(32932); ?> (Oracle LDAP: ldap_get_entries(), invalid pointer). (Jani)</li>
1451014510
<li><?php bugfix(32930); ?> (class extending DOMDocument doesn't clone properly). (Rob)</li>
14511-
<li><?php bugfix(32924); ?> (file included with "auto_prepend_file" can be included with require_once() or require_once()). (Stas)</li>
14511+
<li><?php bugfix(32924); ?> (file included with "auto_prepend_file" can be included with require_once() or include_once()). (Stas)</li>
1451214512
<li><?php bugfix(32904); ?> (pg_get_notify() ignores result_type parameter). (Tony)</li>
1451314513
<li><?php bugfix(32852); ?> (Crash with singleton and __destruct when zend.ze1_compatibility_mode = On). (Dmitry)</li>
1451414514
<li><?php bugfix(32833); ?> (Invalid opcode). (Dmitry)</li>
@@ -15695,7 +15695,7 @@ function by using parent::__clone(). (Zeev, Andi)</li>
1569515695
<li>Changed rename(), rmdir() and mkdir() to be routed via streams
1569615696
API. (Sara)</li>
1569715697
<li>Changed stat() and family to be routed via streams API. (Sara)</li>
15698-
<li>Fixed require_once() / require_once() on Windows to honor
15698+
<li>Fixed include_once() / require_once() on Windows to honor
1569915699
case-insensitivity; of files. (Andi)</li>
1570015700
<li>Fixed get_declared_classes() to return only classes. (Andrey,
1570115701
Marcus)</li>

0 commit comments

Comments
 (0)