fix: this allows to implement OPTIONS request handling in framework c… (#38758)

DeepDiver1975 · JammingBen · IljaN · commit d19eb4b4fdc7 · 2021-12-06T11:22:52.000+01:00
* fix: this allows to implement OPTIONS request handling in framework controllers - if it is not a CORS preflight request. CORS requests will continue to be handled by core * Add changelog item for #38758 Co-authored-by: Jannik Stehle <jannik.stehle@gmail.com>
diff --git a/changelog/unreleased/38758 b/changelog/unreleased/38758
@@ -0,0 +1,3 @@
+Enhancement: Allow OPTIONS request handling in framework controllers
+
+https://github.com/owncloud/core/pull/38758
diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
@@ -282,7 +282,7 @@ public function match($url) {
 
 		$matcher = new UrlMatcher($this->root, $this->context);
 
-		if (\OC::$server->getRequest()->getMethod() === "OPTIONS") {
+		if (\OC::$server->getRequest()->getMethod() === "OPTIONS" && \OC::$server->getRequest()->getHeader('Access-Control-Request-Method')) {
 			try {
 				// Checking whether the actual request (one which OPTIONS is pre-flight for)
 				// Is actually valid

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Enhancement: Allow OPTIONS request handling in framework controllers`
	`2`	`+`
	`3`	`+https://github.com/owncloud/core/pull/38758`