@@ -16,16 +16,24 @@ static function get($key,$default = null)
 
     static function set($key, $value, $expire = 0)
 	{
-	    if($expire!=0) $expire=time()+$expire;
-		if(defined('SWOOLE_SERVER'))
+		if ($expire != 0)
 		{
-		    global $php;
-		    $php->response->setcookie($key,$value,$expire,Cookie::$path,Cookie::$domain,Cookie::$secure,Cookie::$httponly);
+			$expire = time() + $expire;
+		}
+		if (defined('SWOOLE_SERVER'))
+		{
+			\Swoole::$php->http->setcookie($key,
+				$value,
+				$expire,
+				Cookie::$path,
+				Cookie::$domain,
+				Cookie::$secure,
+				Cookie::$httponly);
+		}
+		else
+		{
+			setcookie($key, $value, $expire, Cookie::$path, Cookie::$domain, Cookie::$secure, Cookie::$httponly);
 		}
-        else
-        {
-            setcookie($key, $value, $expire, Cookie::$path, Cookie::$domain, Cookie::$secure, Cookie::$httponly);
-        }
     }
 
     static function delete($key)
 
@@ -7,7 +7,7 @@
  * Class Http_LAMP
  * @package Swoole
  */
-class ExtServer implements \Swoole\IFace\Http
+class ExtServer implements Swoole\IFace\Http
 {
     /**
      * @var \swoole_http_request
@@ -63,6 +63,11 @@ function finish($content = null)
         throw new Swoole\ResponseException;
     }
 
+    function setcookie($name, $value = null, $expire = null, $path = '/', $domain = null, $secure = null, $httponly = null)
+    {
+        $this->response->cookie($name, $value, $expire, $path, $domain, $secure, $httponly);
+    }
+
     function setGlobal()
     {
         if (isset($this->request->get))
@@ -137,4 +142,68 @@ function doStatic(\swoole_http_request $req, \swoole_http_response $resp)
         $resp->header('Content-Type', $mime_type);
         $resp->end(file_get_contents($this->document_root . $req->server['request_uri']));
     }
+
+    function onRequest(\swoole_http_request $req, \swoole_http_response $resp)
+    {
+        if ($this->document_root and is_file($this->document_root . $req->server['request_uri']))
+        {
+            $this->doStatic($req, $resp);
+            return;
+        }
+
+        $this->request = $req;
+        $this->response = $resp;
+        $this->setGlobal();
+
+        $php = Swoole::getInstance();
+        try
+        {
+            try
+            {
+                ob_start();
+                /*---------------------处理MVC----------------------*/
+                $body = $php->runMVC();
+                $echo_output = ob_get_contents();
+                if ($echo_output)
+                {
+                    $resp->write($echo_output);
+                }
+                if ($body)
+                {
+                    $resp->write($body);
+                }
+                ob_end_clean();
+                $resp->end();
+            }
+            catch (Swoole\ResponseException $e)
+            {
+                if ($this->finish != 1)
+                {
+                    $resp->status(500);
+                    $resp->end($e->getMessage());
+                }
+            }
+        }
+        catch (\Exception $e)
+        {
+            $resp->status(500);
+            $resp->end($e->getMessage() . "<hr />" . nl2br($e->getTraceAsString()));
+        }
+    }
+
+    function __clean()
+    {
+        $php = Swoole::getInstance();
+        //模板初始化
+        if (!empty($php->tpl))
+        {
+            $php->tpl->clear_all_assign();
+        }
+        //还原session
+        if (!empty($php->session))
+        {
+            $php->session->open = false;
+            $php->session->readonly = false;
+        }
+    }
 }
@@ -28,4 +28,9 @@ function finish($content = null)
     {
         exit($content);
     }
+
+    function setcookie($name, $value = null, $expire = null, $path = '/', $domain = null, $secure = null, $httponly = null)
+    {
+        setcookie($name, $value, $expire, $path, $domain, $secure, $httponly);
+    }
 }
@@ -37,4 +37,9 @@ function finish($content = null)
         if($content) \Swoole::$php->response->body = $content;
         throw new Swoole\ResponseException;
     }
+
+    function setcookie($name, $value = null, $expire = null, $path = '/', $domain = null, $secure = null, $httponly = null)
+    {
+        \Swoole::$php->response->setcookie($name, $value, $expire, $path, $domain, $secure, $httponly);
+    }
 }
@@ -4,8 +4,15 @@
 interface Http
 {
     function header($k, $v);
+
     function status($code);
+
     function response($content);
+
     function redirect($url, $mode = 301);
+
     function finish($content = null);
+
+    function setcookie($name, $value = null, $expire = null, $path = '/', $domain = null, $secure = null,
+        $httponly = null);
 }
@@ -431,63 +431,15 @@ function handlerServer(Swoole\Request $request)
 
     function runHttpServer($host = '0.0.0.0', $port = 9501, $config = array())
     {
-        define('SWOOLE_HTTP_SERVER', true);
-        $this->ext_http_server = $this->loadModule('http');
+        define('SWOOLE_SERVER', true);
+        $this->ext_http_server = $this->http = new Swoole\Http\ExtServer();
         $server = new swoole_http_server($host, $port);
         $server->set($config);
         if (!empty($config['document_root']))
         {
             $this->ext_http_server->document_root = trim($config['document_root']);
         }
-
-        $server->on('Request', function(swoole_http_request $req, swoole_http_response $resp) {
-
-            $http = $this->ext_http_server;
-            if ($http->document_root and is_file($http->document_root . $req->server['request_uri']))
-            {
-                $http->doStatic($req, $resp);
-                return;
-            }
-
-            $http->request = $req;
-            $http->response = $resp;
-            $http->setGlobal();
-
-            $php = Swoole::getInstance();
-            try
-            {
-                try
-                {
-                    ob_start();
-                    /*---------------------处理MVC----------------------*/
-                    $body = $php->runMVC();
-                    $echo_output = ob_get_contents();
-                    if ($echo_output)
-                    {
-                        $resp->write($echo_output);
-                    }
-                    if ($body)
-                    {
-                        $resp->write($body);
-                    }
-                    ob_end_clean();
-                    $resp->end();
-                }
-                catch (Swoole\ResponseException $e)
-                {
-                    if ($http->finish != 1)
-                    {
-                        $resp->status(500);
-                        $resp->end($e->getMessage());
-                    }
-                }
-            }
-            catch (\Exception $e)
-            {
-                $resp->status(500);
-                $resp->end( $e->getMessage()."<hr />".nl2br($e->getTraceAsString()));
-            }
-        });
+        $server->on('Request', [$this->http, 'onRequest']);
         $server->start();
     }
Original file line number	Diff line number	Diff line change
@@ -28,4 +28,9 @@ function finish($content = null)
28	28	{
29	29	exit($content);
30	30	}
	31	+
	32	+ function setcookie($name, $value = null, $expire = null, $path = '/', $domain = null, $secure = null, $httponly = null)
	33	+ {
	34	+ setcookie($name, $value, $expire, $path, $domain, $secure, $httponly);
	35	+ }
31	36	}
Original file line number	Diff line number	Diff line change
@@ -37,4 +37,9 @@ function finish($content = null)
37	37	if($content) \Swoole::$php->response->body = $content;
38	38	throw new Swoole\ResponseException;
39	39	}
	40	+
	41	+ function setcookie($name, $value = null, $expire = null, $path = '/', $domain = null, $secure = null, $httponly = null)
	42	+ {
	43	+ \Swoole::$php->response->setcookie($name, $value, $expire, $path, $domain, $secure, $httponly);
	44	+ }
40	45	}