Let Slim parse HTTP_CONTENT_TYPE header for PHP built-in server

slimphp · Feb 16, 2014 · 32e8b03 · 32e8b03
1 parent ff7d714
commit 32e8b03
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/Slim/Http/Headers.php b/Slim/Http/Headers.php
@@ -72,7 +72,7 @@ public static function extract($data)
         foreach ($data as $key => $value) {
             $key = strtoupper($key);
             if (strpos($key, 'X_') === 0 || strpos($key, 'HTTP_') === 0 || in_array($key, static::$special)) {
-                if ($key === 'HTTP_CONTENT_TYPE' || $key === 'HTTP_CONTENT_LENGTH') {
+                if ($key === 'HTTP_CONTENT_LENGTH') {
                     continue;
                 }
                 $results[$key] = $value;

diff --git a/tests/EnvironmentTest.php b/tests/EnvironmentTest.php
@@ -277,10 +277,8 @@ public function testServerPortIsNotEmpty()
      */
     public function testUnsetsContentTypeAndContentLength()
     {
-        $_SERVER['HTTP_CONTENT_TYPE'] = 'text/csv';
         $_SERVER['HTTP_CONTENT_LENGTH'] = 150;
         $env = \Slim\Environment::getInstance(true);
-        $this->assertFalse(isset($env['HTTP_CONTENT_TYPE']));
         $this->assertFalse(isset($env['HTTP_CONTENT_LENGTH']));
     }
 

diff --git a/tests/Http/RequestTest.php b/tests/Http/RequestTest.php
@@ -517,6 +517,19 @@ public function testGetContentTypeWhenNotExists()
         $this->assertNull($req->getContentType());
     }
 
+    /**
+     * Test get content type with built-in server
+     */
+    public function testGetContentTypeWithBuiltInServer()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'HTTP_CONTENT_TYPE' => 'application/json; charset=ISO-8859-4'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('application/json; charset=ISO-8859-4', $req->getContentType());
+    }
+
     /**
      * Test get media type
      */