Merge remote-tracking branch 'mikecao/master'

cceconi · Mar 20, 2015 · c1b9ecc · c1b9ecc
2 parents ef4f2ad + 10750b5
commit c1b9ecc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.9
+1.2.12
diff --git a/flight/net/Request.php b/flight/net/Request.php
@@ -205,7 +205,7 @@ public static function getBody() {
 
         $method = self::getMethod();
 
-        if ($method == 'POST' || $method == 'PUT') {
+        if ($method == 'POST' || $method == 'PUT' || $method == 'PATCH') {
             $body = file_get_contents('php://input');
         }
 
@@ -218,14 +218,16 @@ public static function getBody() {
      * @return string
      */
     public static function getMethod() {
+        $method = self::getVar('REQUEST_METHOD', 'GET');
+
         if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
-            return $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+            $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
         }
         elseif (isset($_REQUEST['_method'])) {
-            return $_REQUEST['_method'];
+            $method = $_REQUEST['_method'];
         }
 
-        return self::getVar('REQUEST_METHOD', 'GET');
+        return strtoupper($method);
     }
 
     /**

diff --git a/flight/net/Response.php b/flight/net/Response.php
@@ -191,7 +191,6 @@ public function cache($expires) {
             $this->headers['Expires'] = gmdate('D, d M Y H:i:s', $expires) . ' GMT';
             $this->headers['Cache-Control'] = 'max-age='.($expires - time());
         }
-
         return $this;
     }
 
@@ -236,6 +235,11 @@ public function sendHeaders() {
             }
         }
 
+        // Send content length
+        if (($length = strlen($this->body)) > 0) {
+            header('Content-Length: '.$length);
+        }
+
         return $this;
     }