geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-05 07:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Predis\Network\PhpiredisConnection.

Browse Source
This commit is contained in:
Daniele Alessandri
2011-03-06 15:35:05 +01:00
parent 190b687789
commit 995de40734
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Network/PhpiredisConnection.php
+16 -6
View File
@@ -123,10 +123,6 @@ class PhpiredisConnection extends ConnectionBase {
if (!is_resource($socket)) {
$this->emitSocketError();
}
$addressLong = ip2long($parameters->host);
if ($addressLong == -1 || $addressLong === false) {
$host = gethostbyname($parameters->host);
}
return $socket;
}
@@ -162,10 +158,24 @@ class PhpiredisConnection extends ConnectionBase {
}
}
private function getAddress(ConnectionParameters $parameters) {
if ($parameters->scheme === 'unix') {
return $parameters->path;
}
$host = $parameters->host;
if (ip2long($host) === false) {
if (($address = gethostbyname($host)) === $host) {
$this->onCommunicationException("Cannot resolve the address of $host");
}
return $address;
}
return $host;
}
private function connectWithTimeout(ConnectionParameters $parameters) {
$socket = $this->_resource;
$host = self::getAddress($parameters);
$socket = $this->getResource();
socket_set_nonblock($socket);
$host = $parameters->scheme === 'unix' ? $parameters->path : $parameters->host;
if (@socket_connect($socket, $host, $parameters->port) === false) {
$error = socket_last_error();
if ($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY) {