wellton/hhvm
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Fix race condition in ext/sockets/tests

Ver Código-Fonte 
This time the race condition comes from binding sockets!
Esse commit está contido em:
Sara Golemon
2013-05-02 11:01:45 -07:00
pai d15e609333
commit 16e0a5bdf0
7 arquivos alterados com 123 adições e 12 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
hphp/test/zend/good/ext-sockets/ipv4loop.php
+10 -3
Ver Arquivo
@@ -4,8 +4,15 @@
if (!$server) {
die('Unable to create AF_INET socket [server]');
}
if (!socket_bind($server, '127.0.0.1', 31337)) {
die('Unable to bind to 127.0.0.1:31337');
$bound = false;
for($port = 31337; $port < 31357; ++$port) {
if (socket_bind($server, '127.0.0.1', $port)) {
$bound = true;
break;
}
}
if (!$bound) {
die("Unable to bind to 127.0.0.1");
}
if (!socket_listen($server, 2)) {
die('Unable to listen on socket');
@@ -16,7 +23,7 @@
if (!$client) {
die('Unable to create AF_INET socket [client]');
}
if (!socket_connect($client, '127.0.0.1', 31337)) {
if (!socket_connect($client, '127.0.0.1', $port)) {
die('Unable to connect to server socket');
}
hphp/test/zend/good/ext-sockets/ipv6loop.php
+44
Ver Arquivo
@@ -0,0 +1,44 @@
<?php
/* Setup socket server */
$server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
if (!$server) {
die('Unable to create AF_INET6 socket [server]');
}
$bound = false;
for($port = 31337; $port < 31357; ++$port) {
if (socket_bind($server, '::1', $port)) {
$bound = true;
break;
}
}
if (!$bound) {
die("Unable to bind to [::1]:$port");
}
if (!socket_listen($server, 2)) {
die('Unable to listen on socket');
}
/* Connect to it */
$client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
if (!$client) {
die('Unable to create AF_INET6 socket [client]');
}
if (!socket_connect($client, '::1', $port)) {
die('Unable to connect to server socket');
}
/* Accept that connection */
$socket = socket_accept($server);
if (!$socket) {
die('Unable to accept connection');
}
socket_write($client, "ABCdef123\n");
$data = socket_read($socket, 10, PHP_BINARY_READ);
var_dump($data);
socket_close($client);
socket_close($socket);
socket_close($server);
?>
hphp/test/zend/good/ext-sockets/ipv6loop.php.expectf
+2
Ver Arquivo
@@ -0,0 +1,2 @@
string(10) "ABCdef123
"
hphp/test/zend/good/ext-sockets/socket_getpeername_ipv4loop.php
+14 -8
Ver Arquivo
@@ -2,17 +2,23 @@
/* Bind and connect sockets to localhost */
$localhost = '127.0.0.1';
/* Hold the port associated to address */
$port = 31337;
/* Setup socket server */
$server = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));
if (!$server) {
die('Unable to create AF_INET socket [server]');
}
if (!socket_bind($server, $localhost, $port)) {
die('Unable to bind to '.$localhost.':'.$port);
$minport = 31337;
$maxport = 31356;
$bound = false;
for($port = $minport; $port <= $maxport; ++$port) {
if (socket_bind($server, $localhost, $port)) {
$bound = true;
break;
}
}
if (!$bound) {
die('Unable to bind to '.$localhost);
}
if (!socket_listen($server, 2)) {
die('Unable to listen on socket');
@@ -33,10 +39,10 @@
die('Unable to accept connection');
}
if (!socket_getpeername($client, $address, $port)) {
if (!socket_getpeername($client, $address, $peerport)) {
die('Unable to retrieve peer name');
}
var_dump($address, $port);
var_dump($address, $port === $peerport);
socket_close($client);
socket_close($socket);
hphp/test/zend/good/ext-sockets/socket_getpeername_ipv4loop.php.expectf
+1 -1
Ver Arquivo
@@ -1,2 +1,2 @@
string(9) "127.0.0.1"
int(31337)
bool(true)
hphp/test/zend/good/ext-sockets/socket_getpeername_ipv6loop.php
+50
Ver Arquivo
@@ -0,0 +1,50 @@
<?php
/* Bind and connect sockets to localhost */
$localhost = '::1';
/* Setup socket server */
$server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
if (!$server) {
die('Unable to create AF_INET6 socket [server]');
}
$minport = 31337;
$maxport = 31356;
$bound = false;
for($port = $minport; $port <= $maxport; ++$port) {
if (socket_bind($server, $localhost, $port)) {
$bound = true;
break;
}
}
if (!$bound) {
die('Unable to bind to '.$localhost);
}
if (!socket_listen($server, 2)) {
die('Unable to listen on socket');
}
/* Connect to it */
$client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
if (!$client) {
die('Unable to create AF_INET6 socket [client]');
}
if (!socket_connect($client, $localhost, $port)) {
die('Unable to connect to server socket');
}
/* Accept that connection */
$socket = socket_accept($server);
if (!$socket) {
die('Unable to accept connection');
}
if (!socket_getpeername($client, $address, $peerport)) {
die('Unable to retrieve peer name');
}
var_dump($address, $port === $peerport);
socket_close($client);
socket_close($socket);
socket_close($server);
?>
hphp/test/zend/good/ext-sockets/socket_getpeername_ipv6loop.php.expectf
+2
Ver Arquivo
@@ -0,0 +1,2 @@
string(3) "::1"
bool(true)