octicon-mirror(24/)
php/yii2
octicon-rss(16/)
1
0
octicon-repo-forked(16/)Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-10 23:50:38 +08:00
octicon-code(16/) Code octicon-issue-opened(16/) Issues octicon-package(16/) Packages octicon-project(16/) Projects octicon-tag(16/) Releases octicon-book(16/) Wiki octicon-pulse(16/) Activity

Fixed yii\web\User::checkRedirectAcceptable() to treat acceptable content type */* as *

Browse Source 
Closes #11523
This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
SilverFire - Dmitry Naumenko
2016-05-15 22:27:40 +03:00
gitea-unlock(16/)
parent c3c0d04f5b
commit 9f499eb51e
octicon-diff(16/tw-mr-1) 3 changed files with 9 additions and 1 deletions
gitea-whitespace(16/)
gitea-split(16/)
octicon-kebab-horizontal(16/)
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -16,6 +16,7 @@ Yii Framework 2 Change Log
- Bug #11459: Fixed flash messages not destroyed when `session.auto_start = 1` set in php.ini (cartmanchen)
- Bug #11498: Fixed inability to save serialized object into PostgreSQL binary column (klimov-paul)
- Bug #11507: Fixed `yii\validators\EachValidator::validateAttribute()` does not respect `skipOnEmpty` rule parameter (webdevsega)
- Bug #11523: Fixed `yii\web\User::checkRedirectAcceptable()` to treat acceptable content type `*/*` as `*` (silverfire)
- Bug #11532: Fixed casting of empty char value to `null` resulting in integrity constraint violation for not null columns (samdark)

2
framework/web/User.php
View File

@@ -702,7 +702,7 @@ class User extends Component
}
foreach ($acceptableTypes as $type => $params) {
if ($type === '*' || in_array($type, $this->acceptableRedirectTypes, true)) {
if ($type === '*' || $type === '*/*' || in_array($type, $this->acceptableRedirectTypes, true)) {
return true;
}
}

7
tests/framework/web/UserTest.php
View File

@@ -215,6 +215,13 @@ class UserTest extends TestCase
$this->assertEquals('accept-all', $user->getReturnUrl());
$this->assertTrue(Yii::$app->response->getIsRedirection());
$this->reset();
Yii::$app->request->setUrl('accept-all');
$_SERVER['HTTP_ACCEPT'] = '*/*;q=0.1';
$user->loginRequired();
$this->assertEquals('accept-all', $user->getReturnUrl());
$this->assertTrue(Yii::$app->response->getIsRedirection());
$this->reset();
Yii::$app->request->setUrl('accept-html-json');
$_SERVER['HTTP_ACCEPT'] = 'text/json; q=1, text/html; q=0.1';