diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-09 22:51:11 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-09 22:51:11 +0100 |
| commit | fea2994ff83ac75dcb5b186964f20a21b1df3ec0 (patch) | |
| tree | da2ebb4cfeda640e24af87899278dba781a8ec9e /ext/standard | |
| parent | 760faa12b20db56bd3e2faab8d658f622af7da6a (diff) | |
| parent | d5e206620b80b0f198f6dd1865a758edf7ea1494 (diff) | |
| download | php-git-fea2994ff83ac75dcb5b186964f20a21b1df3ec0.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Enclose INI values containing {TMP} in quotes
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/tests/file/bug41655_1-win32.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/bug41655_1.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/tests/file/bug41655_1-win32.phpt b/ext/standard/tests/file/bug41655_1-win32.phpt index f21ad0088b..8ce47b1ff0 100644 --- a/ext/standard/tests/file/bug41655_1-win32.phpt +++ b/ext/standard/tests/file/bug41655_1-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --INI-- -open_basedir={TMP} +open_basedir="{TMP}" --FILE-- <?php $a=glob("./*.jpeg"); diff --git a/ext/standard/tests/file/bug41655_1.phpt b/ext/standard/tests/file/bug41655_1.phpt index 203d20b719..9a95b1c899 100644 --- a/ext/standard/tests/file/bug41655_1.phpt +++ b/ext/standard/tests/file/bug41655_1.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --INI-- -open_basedir={TMP} +open_basedir="{TMP}" --FILE-- <?php $a=glob("./*.jpeg"); |