From d195f224db31644eaaef4b4cb4713d9af5f57ead Mon Sep 17 00:00:00 2001 From: CJ Date: Wed, 17 Apr 2013 01:04:13 +0800 Subject: See #2409: Reformating and code cleanup for request_headers; --- system/core/Input.php | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'system/core') diff --git a/system/core/Input.php b/system/core/Input.php index a0c5552f6..6b7d5bd43 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -801,25 +801,18 @@ class CI_Input { { return $this->headers = apache_request_headers(); } - else - { - $headers['CONTENT_TYPE'] = isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : @getenv('CONTENT_TYPE'); - foreach ($_SERVER as $key => $val) - { - if (sscanf($key, 'HTTP_%s', $header) === 1) - { - $headers[$header] = $this->_fetch_from_array($_SERVER, $key, $xss_clean); - } - } + $this->headers['CONTENT_TYPE'] = isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : @getenv('CONTENT_TYPE'); - // take SOME_HEADER and turn it into Some-Header - foreach ($headers as $key => $val) + foreach ($_SERVER as $key => $val) + { + if (sscanf($key, 'HTTP_%s', $header) === 1) { - $key = str_replace('_', ' ', strtolower($key)); - $key = str_replace(' ', '-', ucwords($key)); + // take SOME_HEADER and turn it into Some-Header + $header = str_replace('_', ' ', strtolower($header)); + $header = str_replace(' ', '-', ucwords($header)); - $this->headers[$key] = $val; + $this->headers[$header] = $this->_fetch_from_array($_SERVER, $key, $xss_clean); } } -- cgit v1.2.3-24-g4f1b