Update WorkermanServer.php

Author: jcheron

src/Ubiquity/servers/workerman/WorkermanServer.php

@@ -34,8 +34,6 @@ class WorkermanServer {
 
 	public $onWorkerStart;
 
-	private static $uriInfos;
-
 	/**
 	 *
 	 * @return int
@@ -122,12 +120,12 @@ protected function handle(ConnectionInterface $connection, $datas) {
 		// $_REQUEST['REQUEST_TIME_FLOAT']=\microtime(true);
 		Http::header('Date: ' . \gmdate('D, d M Y H:i:s') . ' GMT');
 		$_GET['c'] = '';
-		$uriInfos = (self::$uriInfos[$_SERVER['REQUEST_URI']] ??= self::parseURI($_SERVER['REQUEST_URI'], $this->basedir));
+		$uriInfos = \Ubiquity\utils\http\URequest::parseURI($this->basedir);
 		$uri = $uriInfos['uri'];
 		if ($uriInfos['isAction']) {
 			$_GET['c'] = $uri;
 		} else {
-			if ($uriInfos['fe']) {
+			if ($uriInfos['file']) {
 				Http::header('Content-Type: ' . (HttpCache::$header['Accept'] ?? 'text/html; charset=utf-8'), true);
 				return $connection->send(\file_get_contents($this->basedir . '/../' . $uri));
 			} else {
@@ -143,16 +141,6 @@ protected function handle(ConnectionInterface $connection, $datas) {
 		return $connection->send(\ob_get_clean());
 	}
 
-	protected static function parseURI($requestURI, $basedir) {
-		$uri = \ltrim(\urldecode(\parse_url($requestURI, PHP_URL_PATH)), '/');
-		$isAction = ($uri == null || ! ($fe = \file_exists($basedir . '/../' . $uri))) && ($uri != 'favicon.ico');
-		return [
-			'uri' => $uri,
-			'isAction' => $isAction,
-			'file' => $fe
-		];
-	}
-
 	/**
 	 * Sets the worker count
 	 *