diff --git a/library/Zend/Controller/Request/Http.php b/library/Zend/Controller/Request/Http.php
index decfcb055d..3bc13440de 100644
--- a/library/Zend/Controller/Request/Http.php
+++ b/library/Zend/Controller/Request/Http.php
@@ -986,8 +986,10 @@ public function getHeader($header)
         }
 
         // Try to get it from the $_SERVER array first
-        $temp = 'HTTP_' . strtoupper(str_replace('-', '_', $header));
-        if (isset($_SERVER[$temp])) {
+        $temp = strtoupper(str_replace('-', '_', $header));
+        if (isset($_SERVER['HTTP_' . $temp])) {
+            return $_SERVER['HTTP_' . $temp];
+        } else if /* CGI env */ (isset($_SERVER[$temp]) && in_array($temp, array('CONTENT_TYPE', 'CONTENT_LENGTH'))) {
             return $_SERVER[$temp];
         }