mirror of
https://github.com/php/php-src.git
synced 2024-12-01 05:43:38 +08:00
Merge branch 'PHP-7.4'
This commit is contained in:
commit
1cdc0d9056
@ -111,7 +111,7 @@ if (!have_innodb($link))
|
||||
continue;
|
||||
$tmp = mysqli_fetch_assoc($pres);
|
||||
mysqli_free_result($pres);
|
||||
if ($tmp['msg_id'] == $msg_id)
|
||||
if (!$tmp || $tmp['msg_id'] == $msg_id)
|
||||
/* no new message */
|
||||
continue;
|
||||
if ($tmp['msg'] == 'stop')
|
||||
|
@ -21,7 +21,7 @@ try {
|
||||
}
|
||||
chdir(__DIR__);
|
||||
file_put_contents($fname, "blah\n");
|
||||
file_put_contents("foob", "test\n");
|
||||
file_put_contents("fgc_edgecases.txt", "test\n");
|
||||
echo file_get_contents($fname);
|
||||
unlink($fname);
|
||||
mkdir($pname . '/oops');
|
||||
@ -30,9 +30,9 @@ file_put_contents($pname . '/foo/hi', '<?php
|
||||
echo file_get_contents("foo/" . basename(__FILE__));
|
||||
$context = stream_context_create();
|
||||
file_get_contents("./hi", 0, $context, 0, -1);
|
||||
echo file_get_contents("foob");
|
||||
echo file_get_contents("fgc_edgecases.txt");
|
||||
set_include_path("' . addslashes(__DIR__) . '");
|
||||
echo file_get_contents("foob", true);
|
||||
echo file_get_contents("fgc_edgecases.txt", true);
|
||||
echo file_get_contents("./hi", 0, $context);
|
||||
echo file_get_contents("../oops");
|
||||
echo file_get_contents("./hi", 0, $context, 50000);
|
||||
@ -48,7 +48,7 @@ include $pname . '/foo/hi';
|
||||
--CLEAN--
|
||||
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
|
||||
<?php rmdir(__DIR__ . '/poo'); ?>
|
||||
<?php unlink(__DIR__ . '/foob'); ?>
|
||||
<?php unlink(__DIR__ . '/fgc_edgecases.txt'); ?>
|
||||
--EXPECTF--
|
||||
file_get_contents() expects parameter 1 to be a valid path, array given
|
||||
blah
|
||||
@ -56,9 +56,9 @@ blah
|
||||
echo file_get_contents("foo/" . basename(__FILE__));
|
||||
$context = stream_context_create();
|
||||
file_get_contents("./hi", 0, $context, 0, -1);
|
||||
echo file_get_contents("foob");
|
||||
echo file_get_contents("fgc_edgecases.txt");
|
||||
set_include_path("%stests");
|
||||
echo file_get_contents("foob", true);
|
||||
echo file_get_contents("fgc_edgecases.txt", true);
|
||||
echo file_get_contents("./hi", 0, $context);
|
||||
echo file_get_contents("../oops");
|
||||
echo file_get_contents("./hi", 0, $context, 50000);
|
||||
@ -73,9 +73,9 @@ test
|
||||
echo file_get_contents("foo/" . basename(__FILE__));
|
||||
$context = stream_context_create();
|
||||
file_get_contents("./hi", 0, $context, 0, -1);
|
||||
echo file_get_contents("foob");
|
||||
echo file_get_contents("fgc_edgecases.txt");
|
||||
set_include_path("%stests");
|
||||
echo file_get_contents("foob", true);
|
||||
echo file_get_contents("fgc_edgecases.txt", true);
|
||||
echo file_get_contents("./hi", 0, $context);
|
||||
echo file_get_contents("../oops");
|
||||
echo file_get_contents("./hi", 0, $context, 50000);
|
||||
@ -90,9 +90,9 @@ Warning: file_get_contents(): Failed to seek to position 50000 in the stream in
|
||||
echo file_get_contents("foo/" . basename(__FILE__));
|
||||
$context = stream_context_create();
|
||||
file_get_contents("./hi", 0, $context, 0, -1);
|
||||
echo file_get_contents("foob");
|
||||
echo file_get_contents("fgc_edgecases.txt");
|
||||
set_include_path("%stests");
|
||||
echo file_get_contents("foob", true);
|
||||
echo file_get_contents("fgc_edgecases.txt", true);
|
||||
echo file_get_contents("./hi", 0, $context);
|
||||
echo file_get_contents("../oops");
|
||||
echo file_get_contents("./hi", 0, $context, 50000);
|
||||
|
@ -17,7 +17,7 @@ try {
|
||||
}
|
||||
chdir(__DIR__);
|
||||
file_put_contents($fname, "blah\n");
|
||||
file_put_contents("foob", "test\n");
|
||||
file_put_contents("fopen_edgecases2.txt", "test\n");
|
||||
$a = fopen($fname, 'rb');
|
||||
echo fread($a, 1000);
|
||||
fclose($a);
|
||||
@ -25,7 +25,7 @@ unlink($fname);
|
||||
mkdir($pname . '/oops');
|
||||
file_put_contents($pname . '/foo/hi', '<?php
|
||||
$context = stream_context_create();
|
||||
$a = fopen("foob", "rb", false, $context);
|
||||
$a = fopen("fopen_edgecases2.txt", "rb", false, $context);
|
||||
echo fread($a, 1000);
|
||||
fclose($a);
|
||||
fopen("../oops", "r");
|
||||
@ -37,7 +37,7 @@ include $pname . '/foo/hi';
|
||||
--CLEAN--
|
||||
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
|
||||
<?php rmdir(__DIR__ . '/poo'); ?>
|
||||
<?php unlink(__DIR__ . '/foob'); ?>
|
||||
<?php unlink(__DIR__ . '/fopen_edgecases2.txt'); ?>
|
||||
--EXPECTF--
|
||||
fopen() expects parameter 1 to be a valid path, array given
|
||||
blah
|
||||
|
@ -12,16 +12,16 @@ $pname = 'phar://' . $fname;
|
||||
|
||||
chdir(__DIR__);
|
||||
file_put_contents($fname, "blah\n");
|
||||
file_put_contents("foob", "test\n");
|
||||
file_put_contents("readfile_edgecases.txt", "test\n");
|
||||
readfile($fname);
|
||||
unlink($fname);
|
||||
mkdir($pname . '/oops');
|
||||
file_put_contents($pname . '/foo/hi', '<?php
|
||||
readfile("foo/" . basename(__FILE__));
|
||||
$context = stream_context_create();
|
||||
readfile("foob");
|
||||
readfile("readfile_edgecases.txt");
|
||||
set_include_path("' . addslashes(__DIR__) . '");
|
||||
readfile("foob", true);
|
||||
readfile("readfile_edgecases.txt", true);
|
||||
readfile("./hi", 0, $context);
|
||||
readfile("../oops");
|
||||
?>
|
||||
@ -32,15 +32,15 @@ include $pname . '/foo/hi';
|
||||
--CLEAN--
|
||||
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
|
||||
<?php rmdir(__DIR__ . '/poo'); ?>
|
||||
<?php unlink(__DIR__ . '/foob'); ?>
|
||||
<?php unlink(__DIR__ . '/readfile_edgecases.txt'); ?>
|
||||
--EXPECTF--
|
||||
blah
|
||||
<?php
|
||||
readfile("foo/" . basename(__FILE__));
|
||||
$context = stream_context_create();
|
||||
readfile("foob");
|
||||
readfile("readfile_edgecases.txt");
|
||||
set_include_path("%stests");
|
||||
readfile("foob", true);
|
||||
readfile("readfile_edgecases.txt", true);
|
||||
readfile("./hi", 0, $context);
|
||||
readfile("../oops");
|
||||
?>
|
||||
@ -49,9 +49,9 @@ test
|
||||
<?php
|
||||
readfile("foo/" . basename(__FILE__));
|
||||
$context = stream_context_create();
|
||||
readfile("foob");
|
||||
readfile("readfile_edgecases.txt");
|
||||
set_include_path("%stests");
|
||||
readfile("foob", true);
|
||||
readfile("readfile_edgecases.txt", true);
|
||||
readfile("./hi", 0, $context);
|
||||
readfile("../oops");
|
||||
?>
|
||||
|
Loading…
Reference in New Issue
Block a user