summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authortill <till@php.net>2007-08-29 10:45:17 +0000
committertill <till@php.net>2007-08-29 10:45:17 +0000
commit0144c50fc474c5f0145f3ac1fd2f0d2360e21695 (patch)
tree219ce46eb3fe8063799dacc8570d3a37033c51fc /program/include
parented7dd90083ab0fcb4f10715e24b9d3b7ce7c03e3 (diff)
# bugfix (#1484523) fixed rc_request_header function
* normalized input ($HEADER) * also normalized the arrays * returning "really" NULL now (without issueing a warning!)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_shared.inc27
1 files changed, 17 insertions, 10 deletions
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index eeca2b57a..a86a3c048 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -525,22 +525,29 @@ function rc_strrpos($haystack, $needle, $offset=0)
/**
* Read a specific HTTP request header
*
- * @param string Header name
- * @return string Header value or null if not available
+ * @access static
+ * @param string $name Header name
+ * @return mixed Header value or null if not available
*/
function rc_request_header($name)
-{
- if (function_exists('getallheaders'))
{
+ if (function_exists('getallheaders'))
+ {
$hdrs = getallheaders();
- return $hdrs[$name];
- }
+ $hdrs = array_change_key_case($hdrs, CASE_UPPER);
+ $key = strtoupper($name);
+ }
else
- {
- $key = "HTTP_" . strtoupper(strtr($name, "-", "_"));
- return $_SERVER[$key];
+ {
+ $key = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
+ $hdrs = array_change_key_case($_SERVER[$key], CASE_UPPER);
+ }
+ if (isset($hdrs[$key]))
+ {
+ return $hdrs[$key];
+ }
+ return null;
}
-}
/**