Merge pull request #2 from swooletw/develop

Develop
swooletw · Nov 11, 2017 · 747ac63 · 747ac63
2 parents f724d83 + 30972b0
commit 747ac63
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 265 deletions.
diff --git a/docs/chinese.md b/docs/chinese.md
diff --git a/docs/english.md b/docs/english.md
diff --git a/src/Commands/HttpServerCommand.php b/src/Commands/HttpServerCommand.php
@@ -85,7 +85,7 @@ protected function start()
         $port = $this->configs['server']['port'];
 
         $this->info('Starting swoole http server...');
-        $this->info("Swoole http server listend on http://{$host}:{$port}.");
+        $this->info("Swoole http server started: <http://{$host}:{$port}>");
         if ($this->isDaemon()) {
             $this->info('> (You can run this command to ensure the ' .
             'swoole_http_server process is running: ps aux|grep "swoole")');

diff --git a/src/Server/Application.php b/src/Server/Application.php
@@ -2,7 +2,7 @@
 
 namespace SwooleTW\Http\Server;
 
-use Illuminate\Contracts\Foundation\Application as ApplicationContract;
+use Illuminate\Container\Container;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Request;
 
@@ -86,7 +86,7 @@ protected function loadApplication()
      */
     public function getApplication()
     {
-        if (! $this->application instanceof ApplicationContract) {
+        if (!$this->application instanceof Container) {
             $this->application = $this->loadApplication();
         }
 
@@ -98,7 +98,7 @@ public function getApplication()
      */
     public function getKernel()
     {
-        if (! $this->kernel instanceof Kernel) {
+        if (!$this->kernel instanceof Kernel) {
             $this->kernel = $this->getApplication()->make(Kernel::class);
         }
 
@@ -175,7 +175,7 @@ protected function setFramework($framework)
     {
         $framework = strtolower($framework);
 
-        if (! in_array($framework, ['laravel', 'lumen'])) {
+        if (!in_array($framework, ['laravel', 'lumen'])) {
             throw new \Exception(sprintf('Not support framework "%s".', $this->framework));
         }
 

diff --git a/src/Server/Manager.php b/src/Server/Manager.php
@@ -167,9 +167,15 @@ public function onRequest($swooleRequest, $swooleResponse)
         $illuminateRequest = Request::make($swooleRequest)->toIlluminate();
         $illuminateResponse = $this->getApplication()->run($illuminateRequest);
 
-        Response::make($illuminateResponse, $swooleResponse)->send();
+        $response = Response::make($illuminateResponse, $swooleResponse);
+        // To prevent 'connection[...] is closed' error.
+        if (!$this->server->exist($response->getSwooleResponse()->fd)) {
+            return;
+        }
+        $response->send();
 
         // Unset request and response.
+        $response = null;
         $swooleRequest = null;
         $swooleResponse = null;
         $illuminateRequest = null;