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

filereader improvements

Browse Source
This commit is contained in:
kremsy
2014-02-17 12:18:56 +01:00
committed by Steffen Schröder
parent 0054d8931d
commit 8fa4abfb7d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,8 @@ class AsynchronousFileReader {
} }
$socket->streamBuffer .= $line; $socket->streamBuffer .= $line;
if (feof($socket->socket) || isset($socket->header["content-length"]) && strlen($socket->streamBuffer) >= $socket->header["content-length"]) { $chunked = isset($socket->header["transfer-encoding"]) && $socket->header["transfer-encoding"] == "chunked" && $line == "0";
//TODO special handling for chunked... if ($chunked || isset($socket->header["content-length"]) && strlen($socket->streamBuffer) >= $socket->header["content-length"]) {
fclose($socket->socket); fclose($socket->socket);
unset($this->sockets[$key]); unset($this->sockets[$key]);
$this->handleContent($socket); $this->handleContent($socket);
@@ -76,17 +76,16 @@ class AsynchronousFileReader {
} else*/ } else*/
if ($socket->header["status"] != "200") { if ($socket->header["status"] != "200") {
$error = self::RESPONSE_ERROR; $error = self::RESPONSE_ERROR;
$result = $this->parseResult2($socket); $result = $this->parseResult($socket);
} else if ($socket->streamBuffer == '') { } else if ($socket->streamBuffer == '') {
$error = self::NO_DATA_ERROR; $error = self::NO_DATA_ERROR;
} else { } else {
$result = $this->parseResult2($socket); $result = $this->parseResult($socket);
if ($result == self::INVALID_RESULT_ERROR) { if ($result == self::INVALID_RESULT_ERROR) {
$error = self::INVALID_RESULT_ERROR; $error = self::INVALID_RESULT_ERROR;
} }
} }
//var_dump($result);
call_user_func($socket->function, $result, $error); call_user_func($socket->function, $result, $error);
//} //}
} }
@@ -98,9 +97,9 @@ class AsynchronousFileReader {
* @internal param $streamBuffer * @internal param $streamBuffer
* @return string * @return string
*/ */
private function parseResult2(SocketStructure $socket) { private function parseResult(SocketStructure $socket) {
if (isset($socket->header["transfer-encoding"])) { if (isset($socket->header["transfer-encoding"]) && $socket->header["transfer-encoding"] == "chunked") {
$result = $this->decode_chunked($socket->streamBuffer); $result = $this->decode_chunked($socket->streamBuffer);
} else { } else {
$result = $socket->streamBuffer; $result = $socket->streamBuffer;