geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-08-30 20:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

No need for socket_import_stream() to set TCP_NODELAY since PHP 7.1.

Browse Source
This commit is contained in:
Daniele Alessandri
2020-09-04 17:56:19 +02:00
parent 67487528eb
commit e5f44c33a2
4 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Connection/PhpiredisStreamConnection.php
+3 -4
View File
@@ -109,14 +109,13 @@ class PhpiredisStreamConnection extends StreamConnection
/**
* {@inheritdoc}
*/
protected function createStreamSocket(ParametersInterface $parameters, $address, $flags, $context = null)
protected function createStreamSocket(ParametersInterface $parameters, $address, $flags)
{
$socket = null;
$timeout = (isset($parameters->timeout) ? (float) $parameters->timeout : 5.0);
$context = stream_context_create(['socket' => ['tcp_nodelay' => (bool) $parameters->tcp_nodelay]]);
$resource = @stream_socket_client($address, $errno, $errstr, $timeout, $flags);
if (!$resource) {
if (!$resource = @stream_socket_client($address, $errno, $errstr, $timeout, $flags, $context)) {
$this->onConnectionError(trim($errstr), $errno);
}
src/Connection/StreamConnection.php
+2 -6
View File
@@ -103,8 +103,9 @@ class StreamConnection extends AbstractConnection
protected function createStreamSocket(ParametersInterface $parameters, $address, $flags)
{
$timeout = (isset($parameters->timeout) ? (float) $parameters->timeout : 5.0);
$context = stream_context_create(['socket' => ['tcp_nodelay' => (bool) $parameters->tcp_nodelay]]);
if (!$resource = @stream_socket_client($address, $errno, $errstr, $timeout, $flags)) {
if (!$resource = @stream_socket_client($address, $errno, $errstr, $timeout, $flags, $context)) {
$this->onConnectionError(trim($errstr), $errno);
}
@@ -116,11 +117,6 @@ class StreamConnection extends AbstractConnection
stream_set_timeout($resource, $timeoutSeconds, $timeoutUSeconds);
}
if (isset($parameters->tcp_nodelay) && function_exists('socket_import_stream')) {
$socket = socket_import_stream($resource);
socket_set_option($socket, SOL_TCP, TCP_NODELAY, (int) $parameters->tcp_nodelay);
}
return $resource;
}
tests/Predis/Connection/PhpiredisStreamConnectionTest.php
+42
View File
@@ -194,4 +194,46 @@ class PhpiredisStreamConnectionTest extends PredisConnectionTestCase
$this->assertNotSame($connection1->getResource(), $connection2->getResource());
}
/**
* @group connected
*/
public function testTcpNodelayParameterSetsContextFlagWhenTrue()
{
$connection = $this->createConnectionWithParams(['tcp_nodelay' => true]);
$options = stream_context_get_options($connection->getResource());
$this->assertIsArray($options);
$this->assertArrayHasKey('socket', $options);
$this->assertArrayHasKey('tcp_nodelay', $options['socket']);
$this->assertTrue($options['socket']['tcp_nodelay']);
}
/**
* @group connected
*/
public function testTcpNodelayParameterDoesNotSetContextFlagWhenFalse()
{
$connection = $this->createConnectionWithParams(['tcp_nodelay' => false]);
$options = stream_context_get_options($connection->getResource());
$this->assertIsArray($options);
$this->assertArrayHasKey('socket', $options);
$this->assertArrayHasKey('tcp_nodelay', $options['socket']);
$this->assertFalse($options['socket']['tcp_nodelay']);
}
/**
* @group connected
*/
public function testTcpDelayContextFlagIsNotSetByDefault()
{
$connection = $this->createConnectionWithParams([]);
$options = stream_context_get_options($connection->getResource());
$this->assertIsArray($options);
$this->assertArrayHasKey('socket', $options);
$this->assertArrayHasKey('tcp_nodelay', $options['socket']);
$this->assertFalse($options['socket']['tcp_nodelay']);
}
}
tests/Predis/Connection/StreamConnectionTest.php
+42
View File
@@ -132,4 +132,46 @@ class StreamConnectionTest extends PredisConnectionTestCase
$this->assertNotSame($connection1->getResource(), $connection2->getResource());
}
/**
* @group connected
*/
public function testTcpNodelayParameterSetsContextFlagWhenTrue()
{
$connection = $this->createConnectionWithParams(['tcp_nodelay' => true]);
$options = stream_context_get_options($connection->getResource());
$this->assertIsArray($options);
$this->assertArrayHasKey('socket', $options);
$this->assertArrayHasKey('tcp_nodelay', $options['socket']);
$this->assertTrue($options['socket']['tcp_nodelay']);
}
/**
* @group connected
*/
public function testTcpNodelayParameterDoesNotSetContextFlagWhenFalse()
{
$connection = $this->createConnectionWithParams(['tcp_nodelay' => false]);
$options = stream_context_get_options($connection->getResource());
$this->assertIsArray($options);
$this->assertArrayHasKey('socket', $options);
$this->assertArrayHasKey('tcp_nodelay', $options['socket']);
$this->assertFalse($options['socket']['tcp_nodelay']);
}
/**
* @group connected
*/
public function testTcpDelayContextFlagIsNotSetByDefault()
{
$connection = $this->createConnectionWithParams([]);
$options = stream_context_get_options($connection->getResource());
$this->assertIsArray($options);
$this->assertArrayHasKey('socket', $options);
$this->assertArrayHasKey('tcp_nodelay', $options['socket']);
$this->assertFalse($options['socket']['tcp_nodelay']);
}
}