php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-25 03:01:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiple headers management in Access-Control-Request-Headers

Browse Source
This commit is contained in:
Philippe Gaultier
2014-07-04 14:19:33 +02:00
parent f31bfd1f1a
commit 25ad826dd0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
framework/filters/Cors.php
View File

@@ -179,9 +179,9 @@ class Cors extends ActionFilter
if (isset($requestHeaders[$requestHeaderField])) { if (isset($requestHeaders[$requestHeaderField])) {
if (in_array('*', $this->cors[$requestHeaderField])) { if (in_array('*', $this->cors[$requestHeaderField])) {
if ($type === 'Method') { if ($type === 'Method') {
$responseHeaders[$responseHeaderField] = strtoupper($responseHeaders[$responseHeaderField]); $responseHeaders[$responseHeaderField] = strtoupper($requestHeaders[$requestHeaderField]);
} elseif ($type === 'Headers') { } elseif ($type === 'Headers') {
$responseHeaders[$responseHeaderField] = static::headerize($responseHeaders[$responseHeaderField]); $responseHeaders[$responseHeaderField] = static::headerize($requestHeaders[$requestHeaderField]);
} }
} else { } else {
$requestedData = preg_split("/[\s,]+/", $requestHeaders[$requestHeaderField], -1, PREG_SPLIT_NO_EMPTY); $requestedData = preg_split("/[\s,]+/", $requestHeaders[$requestHeaderField], -1, PREG_SPLIT_NO_EMPTY);
@@ -190,7 +190,6 @@ class Cors extends ActionFilter
if ($type === 'Method') { if ($type === 'Method') {
$req = strtoupper($req); $req = strtoupper($req);
} elseif ($type === 'Headers') { } elseif ($type === 'Headers') {
// ucwords
$req = static::headerize($req); $req = static::headerize($req);
} }
if (in_array($req, $this->cors[$requestHeaderField])) { if (in_array($req, $this->cors[$requestHeaderField])) {
@@ -222,13 +221,17 @@ class Cors extends ActionFilter
/** /**
* Convert any string (including php headers with HTTP prefix) to header format like : * Convert any string (including php headers with HTTP prefix) to header format like :
* * X-PINGOTHER -> X-Pingother * * X-PINGOTHER -> X-Pingother
* * HTTP_X_PINGOTHER -> X-Pingother * * X_PINGOTHER -> X-Pingother
* @param string $string string to convert * @param string $string string to convert
* @return string the result in "header" format * @return string the result in "header" format
*/ */
protected static function headerize($string) protected static function headerize($string)
{ {
return str_replace(' ', '-', ucwords(strtolower(str_replace(['_', '-'], [' ', ' '], $string)))); $headers = preg_split("/[\s,]+/", $string, -1, PREG_SPLIT_NO_EMPTY);
$headers = array_map(function($element) {
return str_replace(' ', '-', ucwords(strtolower(str_replace(['_', '-'], [' ', ' '], $element))));
}, $headers);
return implode(', ', $headers);
} }
/** /**