com php-src: use local resources instead remote: ext/standard/t ests/file/file_get_contents_error001.phpt ext/s tandard/tests/streams/bug74090.phpt

From: Date: Thu, 14 Feb 2019 18:51:40 +0000
Subject: com php-src: use local resources instead remote: ext/standard/t ests/file/file_get_contents_error001.phpt ext/s tandard/tests/streams/bug74090.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104641@lists.php.net to get a copy of this message
Commit: 6bf1f434f089a00dccfd8a594e25191887c650d9 Author: rjhdby <andrewgrom@rambler.ru> Thu, 14 Feb 2019 14:00:57 +0300 Committer: Peter Kokot <peterkokot@gmail.com> Thu, 14 Feb 2019 19:51:40 +0100 Parents: b996476578ff1bff3538e8ca5fe2d48b91d2e2be Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6bf1f434f089a00dccfd8a594e25191887c650d9 Log: use local resources instead remote Changed paths: M ext/standard/tests/file/file_get_contents_error001.phpt M ext/standard/tests/streams/bug74090.phpt Diff: diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt index d86b37d..45c376b 100644 --- a/ext/standard/tests/file/file_get_contents_error001.phpt +++ b/ext/standard/tests/file/file_get_contents_error001.phpt @@ -11,7 +11,7 @@ display_errors=false ?> --FILE-- <?php - var_dump(file_get_contents("http://checkip.dyndns.com",null,null,8000,1)); + var_dump(file_get_contents("php://stdin",null,null,8000,1)); ?> --EXPECT-- bool(false) diff --git a/ext/standard/tests/streams/bug74090.phpt b/ext/standard/tests/streams/bug74090.phpt index f618700..7a0250a 100644 --- a/ext/standard/tests/streams/bug74090.phpt +++ b/ext/standard/tests/streams/bug74090.phpt @@ -7,14 +7,26 @@ if (getenv("SKIP_SLOW_TESTS")) { die('skip: slow test'); } ?> --FILE-- <?php +$port = 12327; +$server = false; +while(!$server && $port < 20000){ + $port++; + $server = stream_socket_server("udp://localhost:$port", $errno, $errstr, STREAM_SERVER_BIND); +} +if(!$server){ + var_dump(false); + die("Cannot create server socket"); +} $data = base64_decode("1oIBAAABAAAAAAAAB2V4YW1wbGUDb3JnAAABAAE="); -$fd = stream_socket_client("udp://8.8.8.8:53", $errno, $errstr, 0, STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT); +$fd = stream_socket_client("udp://localhost:$port", $errno, $errstr, 0, STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT); stream_set_blocking($fd, 0); -stream_socket_sendto($fd,$data); -sleep(1); -$ret = stream_get_contents($fd,65565); +stream_socket_sendto($fd, $data); +stream_socket_recvfrom($server, 1, 0, $peer); +stream_socket_sendto($server, $data, 0, $peer); +$ret = stream_get_contents($fd, 65565); var_dump(strlen($ret) > 0); -stream_socket_shutdown($fd,STREAM_SHUT_RDWR); +stream_socket_shutdown($fd, STREAM_SHUT_RDWR); +stream_socket_shutdown($server, STREAM_SHUT_RDWR); ?> ==DONE== --EXPECT--

« previous php.cvs (#104641) next »