From 27376951c1906c113d7acc513e45fc0b63c2b05f Mon Sep 17 00:00:00 2001 From: Elvira Sheina Date: Fri, 1 Dec 2017 00:08:38 +0500 Subject: [PATCH] Fixes #9137: Added `Access-Control-Allow-Method` header for the OPTIONS request --- framework/CHANGELOG.md | 1 + framework/rest/OptionsAction.php | 1 + 2 files changed, 2 insertions(+) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index c411f63..b271d06 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -11,6 +11,7 @@ Yii Framework 2 Change Log - Bug #15194: Fixed `yii\db\QueryBuilder::insert()` to preserve passed params when building a `INSERT INTO ... SELECT` query for MSSQL, PostgreSQL and SQLite (sergeymakinen) - Bug #15229: Fixed `yii\console\widgets\Table` default value for `getScreenWidth()`, when `Console::getScreenSize()` can't determine screen size (webleaf) - Bug #15234: Fixed `\yii\widgets\LinkPager` removed `tag` from `disabledListItemSubTagOptions` (SDKiller) +- Enh #9137: Added `Access-Control-Allow-Method` header for the OPTIONS request (developeruz) - Enh #15135: Automatic completion for help in bash and zsh (Valkeru) - Enh #14662: Added support for custom `Content-Type` specification to `yii\web\JsonResponseFormatter` (Kolyunya) - Enh #14568: Refactored migration templates to use `safeUp()` and `safeDown()` methods (Kolyunya) diff --git a/framework/rest/OptionsAction.php b/framework/rest/OptionsAction.php index 9fee8a2..5ce6d8f 100644 --- a/framework/rest/OptionsAction.php +++ b/framework/rest/OptionsAction.php @@ -40,5 +40,6 @@ class OptionsAction extends \yii\base\Action } $options = $id === null ? $this->collectionOptions : $this->resourceOptions; Yii::$app->getResponse()->getHeaders()->set('Allow', implode(', ', $options)); + Yii::$app->getResponse()->getHeaders()->set('Access-Control-Allow-Method', implode(', ', $options)); } }