optimize

1. header send change 2. json header send and error 3. exception out put 4. post row body
hisune · Dec 2, 2015 · 9ccceda · 9ccceda
1 parent 2323259
commit 9ccceda
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/Tiny/Dispatch.php b/Tiny/Dispatch.php
@@ -19,8 +19,7 @@ public function __construct($route)
 
     public function controller()
     {
-        session_start();
-        headers_sent() OR header('Content-Type: text/html; charset=utf-8');
+        @session_start();
 
         if(php_sapi_name() == 'cli'){
             list(Request::$controller, Request::$method, Request::$params) = $this->cliRoute();

diff --git a/Tiny/Error.php b/Tiny/Error.php
@@ -36,6 +36,7 @@ public static function printException($e, $addOn = null)
     {
         $detail = Html::tag('b', get_class($e), array('style' => 'color: #990000'));
         if(Config::config()->show_error){
+            headers_sent() OR header('HTTP/1.0 500 Internal Server Error');
             $detail .= Html::tag('p', $e->getMessage());
             $detail .= Html::tag('p', Html::tag('b', $e->getFile()) . '(line ' . $e->getLine() . ')');
             $addOn && $detail .= HTML::tag('p', $addOn);
@@ -65,6 +66,7 @@ public static function print404()
 
     public static function echoJson($status, $data = '', $exit = true, $writeLog = false, $writeMessage = null)
     {
+        headers_sent() || header('Content-Type: application/json; charset=utf-8');
         echo json_encode(array('status' => $status, 'data' => $data));
         if($writeLog){
             if(!$writeMessage)

diff --git a/Tiny/Exception.php b/Tiny/Exception.php
@@ -10,11 +10,6 @@
 class Exception
 {
 
-    public static function header()
-    {
-        headers_sent() OR header('HTTP/1.0 500 Internal Server Error');
-    }
-
     public static function fatal()
     {
         if($e = error_get_last())
@@ -28,15 +23,16 @@ public static function exception(\Exception $e, $addOn = null)
 
         try{
             Error::logMessage($message);
-            self::header();
 
             Error::printException($e, $addOn);
         }catch(\Exception $e){
-            print $message;
+            if(Config::config()->show_error)
+                print $message;
         }
 
         exit(1);
     }
+
 }
 
 // END
diff --git a/Tiny/Request.php b/Tiny/Request.php
@@ -15,6 +15,7 @@ class Request
     public static $controller;
     public static $method;
     public static $params;
+    public static $rowBody = null;
 
     /**
      * Is this a GET request?
@@ -63,7 +64,10 @@ public static function server($key = null)
 
     public static function rawBody()
     {
-        return file_get_contents('php://input');
+        if(is_null(static::$rowBody))
+            static::$rowBody = file_get_contents('php://input');
+
+        return static::$rowBody;
     }
 
     // 当前请求的url

diff --git a/Tiny/View.php b/Tiny/View.php
@@ -53,6 +53,7 @@ public function display($tpl = '')
         }else
             $content = $this->_getContent($tpl);
         $this->addToken($content);
+        headers_sent() || header('Content-Type: text/html; charset=utf-8');
         echo $content;
     }