beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

client fixes

Browse Source
This commit is contained in:
kremsy 2014-02-27 18:19:36 +01:00 committed by Steffen Schröder
parent 653793682a
commit 0fbc7f3cfd
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
application/core/Libs/Maniaplanet/DedicatedServer/Xmlrpc/Client.php
View File

@ -113,7 +113,7 @@ class Client
$this->bigEndianTest(); $this->bigEndianTest();
// open connection // open connection
$this->socket = @fsockopen($hostname, $port, $errno, $errstr, $this->timeout * 10000); $this->socket = @fsockopen($hostname, $port, $errno, $errstr, $this->timeout);
if (!$this->socket) if (!$this->socket)
{ {
throw new FatalException("transport error - could not open socket (error: $errno, $errstr)", FatalException::NOT_INITIALIZED); throw new FatalException("transport error - could not open socket (error: $errno, $errstr)", FatalException::NOT_INITIALIZED);
@ -356,12 +356,7 @@ class Client
if ($this->protocol == 1) if ($this->protocol == 1)
return false; return false;
// flo: moved to end @stream_set_timeout($this->socket, 0, $this->timeout * 20); // timeout 1 ms (to read available data)
//$something_received = count($this->cb_message)>0;
$contents = '';
$contents_length = 0;
@stream_set_timeout($this->socket, 0, $this->timeout * 100); // timeout 10 ms (to read available data)
// (assignment in arguments is forbidden since php 5.1.1) // (assignment in arguments is forbidden since php 5.1.1)
$read = array($this->socket); $read = array($this->socket);
$write = NULL; $write = NULL;
@ -370,7 +365,7 @@ class Client
try try
{ {
$nb = @stream_select($read, $write, $except, 0, $this->timeout * 100); $nb = @stream_select($read, $write, $except, 0, $this->timeout * 20);
} }
catch (\Exception $e) catch (\Exception $e)
{ {
@ -396,14 +391,16 @@ class Client
while ($nb !== false && $nb > 0) while ($nb !== false && $nb > 0)
{ {
$size = 0;
$recvhandle = 0;
// Get result // Get result
$contents = fread($this->socket, 8); $contents = '';
if (strlen($contents) == 0 || $contents === false) while(strlen($contents) < 8){
{ $contents .= fread($this->socket, 8 - strlen($contents));
throw new FatalException('transport error - connection interrupted!', FatalException::INTERRUPTED); if (strlen($contents) == 0 || $contents === false)
{
throw new FatalException('transport error - connection interrupted!', FatalException::INTERRUPTED);
}
} }
$array_result = unpack('Vsize/Vhandle', $contents); $array_result = unpack('Vsize/Vhandle', $contents);
$size = $array_result['size']; $size = $array_result['size'];
$recvhandle = $array_result['handle']; $recvhandle = $array_result['handle'];