Merge pull request #34 from swooletw/develop

Develop

Author: albertcht

src/Server/Manager.php

@@ -292,7 +292,9 @@ public function onRequest($swooleRequest, $swooleResponse)
     protected function handleStaticRequest($illuminateRequest, $swooleResponse)
     {
         $uri = $illuminateRequest->getRequestUri();
-        if (strpos($uri, '.php') || strpos($uri, '.htaccess') || strpos($uri, '.config')) {
+        $blackList = ['php', 'htaccess', 'config'];
+        $extension = substr(strrchr($uri, '.'), 1);
+        if ($extension && in_array($extension, $blackList)) {
             return;
         }
 
@@ -304,7 +306,13 @@ protected function handleStaticRequest($illuminateRequest, $swooleResponse)
         }
 
         $swooleResponse->status(200);
-        $swooleResponse->header('Content-Type', mime_content_type($filename));
+        $mime = mime_content_type($filename);
+        if ($extension === 'js') {
+            $mime = 'text/javascript';
+        } elseif ($extension === 'css') {
+            $mime = 'text/css';
+        }
+        $swooleResponse->header('Content-Type', $mime);
         $swooleResponse->sendfile($filename);
 
         return true;

src/Server/Response.php

@@ -86,9 +86,8 @@ protected function sendHeaders()
 
         // cookies
         foreach ($illuminateResponse->headers->getCookies() as $cookie) {
-            $method = $cookie->isRaw() ? 'rawcookie' : 'cookie';
-
-            $this->swooleResponse->$method(
+            // may need to consider rawcookie
+            $this->swooleResponse->cookie(
                 $cookie->getName(), $cookie->getValue(),
                 $cookie->getExpiresTime(), $cookie->getPath(),
                 $cookie->getDomain(), $cookie->isSecure(),