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

preparements http1.1

Browse Source
This commit is contained in:
kremsy 2014-02-15 12:23:38 +01:00 committed by Steffen Schröder
parent 6661197cb6
commit aa023dba43
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/core/Files/AsynchronousFileReader.php
View File

@ -41,7 +41,6 @@ class AsynchronousFileReader {
foreach($this->sockets as $key => &$socket) { foreach($this->sockets as $key => &$socket) {
/** @var SocketStructure $socket */ /** @var SocketStructure $socket */
$socket->streamBuffer .= fread($socket->socket, 4096); $socket->streamBuffer .= fread($socket->socket, 4096);
if (feof($socket->socket) || time() > ($socket->creationTime + self::SOCKET_TIMEOUT)) { if (feof($socket->socket) || time() > ($socket->creationTime + self::SOCKET_TIMEOUT)) {
fclose($socket->socket); fclose($socket->socket);
unset($this->sockets[$key]); unset($this->sockets[$key]);
@ -56,7 +55,6 @@ class AsynchronousFileReader {
$error = self::NO_DATA_ERROR; $error = self::NO_DATA_ERROR;
} else { } else {
$resultArray = explode("\r\n\r\n", $socket->streamBuffer, 2); $resultArray = explode("\r\n\r\n", $socket->streamBuffer, 2);
if (count($resultArray) < 2) { if (count($resultArray) < 2) {
$error = self::INVALID_RESULT_ERROR; $error = self::INVALID_RESULT_ERROR;
} else { } else {
@ -74,9 +72,10 @@ class AsynchronousFileReader {
* @param string $url * @param string $url
* @param $function * @param $function
* @param string $contentType * @param string $contentType
* @param string $customHeader
* @return bool * @return bool
*/ */
public function loadFile($url, $function, $contentType = 'UTF-8', $customHeader = '') { public function loadFile($url, $function, $contentType = 'utf-8', $customHeader = '') {
if (!is_callable($function)) { if (!is_callable($function)) {
$this->maniaControl->log("Function is not callable"); $this->maniaControl->log("Function is not callable");
return false; return false;
@ -94,10 +93,12 @@ class AsynchronousFileReader {
return false; return false;
} }
//TODO head over to http/1.1
if ($customHeader == '') { if ($customHeader == '') {
$query = 'GET ' . $urlData['path'] . $urlQuery . ' HTTP/1.0' . PHP_EOL; $query = 'GET ' . $urlData['path'] . $urlQuery . ' HTTP/1.0' . PHP_EOL;
$query .= 'Host: ' . $urlData['host'] . PHP_EOL; $query .= 'Host: ' . $urlData['host'] . PHP_EOL;
$query .= 'Content-Type: ' . $contentType . PHP_EOL; $query .= 'Content-Type: ' . $contentType . PHP_EOL;
//$query .= 'Connection: close' . PHP_EOL; //TODO for http 1.1
$query .= 'User-Agent: ManiaControl v' . ManiaControl::VERSION . PHP_EOL; $query .= 'User-Agent: ManiaControl v' . ManiaControl::VERSION . PHP_EOL;
$query .= PHP_EOL; $query .= PHP_EOL;
} else { } else {