From 7bbed34b168ae39d91f8f7564042a98b9ebf7abc Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Thu, 17 Apr 2014 22:14:49 -0700 Subject: [PATCH] Use Content-Type header stored in CONTENT_TYPE per RFC 3875 Normalize $_SERVER['CONTENT_TYPE'] with value from $_SERVER['HTTP_CONTENT_TYPE'] --- tests/PHPCurlClass/PHPCurlClassTest.php | 2 +- tests/PHPCurlClass/server.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php index 449a061..656e350 100644 --- a/tests/PHPCurlClass/PHPCurlClassTest.php +++ b/tests/PHPCurlClass/PHPCurlClassTest.php @@ -350,7 +350,7 @@ class CurlTest extends PHPUnit_Framework_TestCase { $test->curl->setHeader('X-Requested-With', 'XMLHttpRequest'); $test->curl->setHeader('Accept', 'application/json'); $this->assertTrue($test->server('server', 'GET', array( - 'key' => 'HTTP_CONTENT_TYPE', // OR "CONTENT_TYPE". + 'key' => 'CONTENT_TYPE', )) === 'application/json'); $this->assertTrue($test->server('server', 'GET', array( 'key' => 'HTTP_X_REQUESTED_WITH', diff --git a/tests/PHPCurlClass/server.php b/tests/PHPCurlClass/server.php index cb1e51d..bc430ac 100644 --- a/tests/PHPCurlClass/server.php +++ b/tests/PHPCurlClass/server.php @@ -4,6 +4,9 @@ $_PUT = array(); $_PATCH = array(); $request_method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : ''; +if (!array_key_exists('CONTENT_TYPE', $_SERVER) && array_key_exists('HTTP_CONTENT_TYPE', $_SERVER)) { + $_SERVER['CONTENT_TYPE'] = $_SERVER['HTTP_CONTENT_TYPE']; +} $content_type = isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : ''; $data_values = $_GET; if ($request_method === 'POST') {