Merge pull request #1 from phpMv/techempower-benchmarks

Techempower benchmarks

Author: jcheron

composer.lock

@@ -29,9 +29,9 @@ class WorkermanServer {
 
 	private $options;
 
-	private $events=[];
-	
 	private $wCount;
+	
+	public $onWorkerStart;
 
 	/**
 	 *
@@ -76,12 +76,6 @@ private function configure($http) {
 		$http->set($this->options);
 	}
 
-	private function addEvents($http){
-		foreach ($this->events as $event=>$callback) {
-			$http->on($event,$callback);
-		}
-	}
-
 	public function init($config, $basedir) {
 		$this->config = $config;
 		$this->basedir = $basedir;
@@ -112,35 +106,38 @@ public function run($host, $port, $options = []) {
 		$this->setOptions($options);
 		$this->server=new Worker("http://$host:$port",$this->options);
 		$this->server->count=$this->wCount??4;
+		if(isset($this->onWorkerStart)){
+			$this->server->onWorkerStart=$this->onWorkerStart;
+		}
 		$this->server->onMessage =function($connection,$datas){
-			$this->handle($connection,$datas);
+			return $this->handle($connection,$datas);
 		};
 		Worker::runAll();
 	}
 
 
 	protected function handle(ConnectionInterface $connection,$datas) {
-		$_REQUEST['REQUEST_TIME_FLOAT']=\microtime(true);
-		Http::header('Date: '.gmdate('D, d M Y H:i:s').' GMT');
+		//$_REQUEST['REQUEST_TIME_FLOAT']=\microtime(true);
+		Http::header('Date: '.\gmdate('D, d M Y H:i:s').' GMT');
 		$_GET['c'] = '';
 		$uri = \ltrim(\urldecode(\parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)), '/');
 		if (($uri == null || ! ($fe=\file_exists($this->basedir . '/../' . $uri))) && ($uri!='favicon.ico')) {
 			$_GET['c'] = $uri;
 		} else {
 			if($fe){
 				Http::header('Content-Type: '. HttpCache::$header['Accept'] ?? 'text/html; charset=utf-8',true);
-				$connection->send(\file_get_contents($this->basedir . '/../' . $uri));
+				return $connection->send(\file_get_contents($this->basedir . '/../' . $uri));
 			}else{
 				Http::header('Content-Type: '. HttpCache::$header['Accept'] ?? 'text/html; charset=utf-8',true,404);
-				$connection->send($uri.' not found!');
+				return $connection->send($uri.' not found!');
 			}
 			return;
 		}
 
 		$this->httpInstance->setDatas($datas);
 		\ob_start();
 		\Ubiquity\controllers\Startup::forward($_GET['c']);
-		$connection->send(\ob_get_clean());
+		return $connection->send(\ob_get_clean());
 	}
 	/**
 	 * Sets the worker count

src/Ubiquity/servers/workerman/WorkermanServer.php

@@ -56,10 +56,8 @@ public function setResponseCode($responseCode) {
 			if (PHP_SAPI != 'cli') {
 				return \http_response_code($responseCode);
 			}
-			if (isset(HttpCache::$codes[$responseCode])) {
-				HttpCache::$header['Http-Code'] = "HTTP/1.1 $responseCode " . HttpCache::$codes[$responseCode];
-				return true;
-			}
+			Http::responseCode($responseCode);
+			return $responseCode;
 		}
 		return false;
 	}