From 657df718bdae25485575346e0a9812bdb6db6c2b Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Mon, 2 Sep 2013 16:16:54 +0200 Subject: fixing cors again --- external/newsapi.php | 4 ++-- middleware/corsmiddleware.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external/newsapi.php b/external/newsapi.php index 067334008..1121f3400 100644 --- a/external/newsapi.php +++ b/external/newsapi.php @@ -79,8 +79,8 @@ class NewsAPI extends Controller { */ public function cors() { // needed for webapps access due to cross origin request policy - if(isset($this->request->server['Origin'])) { - $origin = $this->request->server['Origin']; + if(isset($this->request->server['HTTP_ORIGIN'])) { + $origin = $this->request->server['HTTP_ORIGIN']; } else { $origin = '*'; } diff --git a/middleware/corsmiddleware.php b/middleware/corsmiddleware.php index 187696de6..4fec2faa1 100644 --- a/middleware/corsmiddleware.php +++ b/middleware/corsmiddleware.php @@ -53,10 +53,10 @@ class CORSMiddleware extends Middleware { $annotationReader = new MethodAnnotationReader($controller, $methodName); // only react if its an API request and if the request sends origin - if(isset($this->request->server['Origin']) && + if(isset($this->request->server['HTTP_ORIGIN']) && $annotationReader->hasAnnotation('API')) { - $origin = $this->request->server['Origin']; + $origin = $this->request->server['HTTP_ORIGIN']; $response->addHeader('Access-Control-Allow-Origin', $origin); $response->addHeader('Access-Control-Allow-Credentials', 'true'); -- cgit v1.2.3