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

Revert "Implemented strict http request serialization for APIs that forbid a session to be used in concurrent requests (e.g. dedimania)."

Browse Source 
This reverts commit b0732bee96.
Solution required PHP 7.0.7, thus breaking requirement of compatibility with PHP 5.4.
This commit is contained in:
Sebastian Büttner
2017-05-22 22:59:01 +02:00
parent b0732bee96
commit edcd18e8f5
5 changed files with 12 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/Files/AsynchronousFileReader.php
View File

@ -23,9 +23,6 @@ class AsynchronousFileReader implements UsageInformationAble {
*/
const CONTENT_TYPE_JSON = 'application/json';
const QUEUE_NONSERIALIZING = 0;
const QUEUE_SERIALIZING = 1;
/*
* Private properties
*/
@ -33,7 +30,7 @@ class AsynchronousFileReader implements UsageInformationAble {
private $maniaControl = null;
/** @var \cURL\RequestsQueue|null $requestQueue */
private $requestQueue = array(null, null);
private $requestQueue = null;
/**
* Construct a new Asynchronous File Reader Instance
@ -42,30 +39,22 @@ class AsynchronousFileReader implements UsageInformationAble {
*/
public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
// Queue for non-serializing requests (parallel is preferred)
$this->requestQueue[self::QUEUE_NONSERIALIZING] = new RequestsQueue();
// Queue for per host serialized requests
$this->requestQueue[self::QUEUE_SERIALIZING] = new RequestsQueue();
$this->requestQueue[self::QUEUE_SERIALIZING]->setOption(CURLMOPT_MAX_HOST_CONNECTIONS, 1);
$this->requestQueue = new RequestsQueue();
}
/**
* Append available Data of active Requests
*/
public function appendData() {
foreach ($this->requestQueue as &$queue) {
do {
if (($count = $queue->count()) == 0) {
break;
}
do {
if (($count = $this->requestQueue->count()) == 0) {
break;
}
if ($queue->socketPerform()) {
$queue->socketSelect();
}
} while ($count != $queue->count());
}
if ($this->requestQueue->socketPerform()) {
$this->requestQueue->socketSelect();
}
} while ($count != $this->requestQueue->count());
}
/**
@ -107,10 +96,6 @@ class AsynchronousFileReader implements UsageInformationAble {
* @param Request $request
*/
public function addRequest(Request $request) {
$queueId = $request->getSerialize()
? self::QUEUE_SERIALIZING
: self::QUEUE_NONSERIALIZING;
$queue = $this->requestQueue[$queueId];
$request->attachTo($queue);
$request->attachTo($this->requestQueue);
}
}