From 8ca0a957add3b01efa5bed3762823fe9449414cf Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 28 Jun 2013 17:25:10 +0200
Subject: [PATCH 1/2] Allow setting defaults and requirements for the api route

---
 lib/api.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/api.php b/lib/api.php
index fc76836995b..31f3f968d9b 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -67,6 +67,8 @@ class OC_API {
 			OC::getRouter()->useCollection('ocs');
 			OC::getRouter()->create($name, $url)
 				->method($method)
+				->defaults($defaults)
+				->requirements($requirements)
 				->action('OC_API', 'call');
 			self::$actions[$name] = array();
 		}

From 22d759964f120395cae67319e3d1e03f7ae4006b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 28 Jun 2013 17:25:36 +0200
Subject: [PATCH 2/2] Use raw PathInfo for matching urls

---
 ocs/v1.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocs/v1.php b/ocs/v1.php
index af83a56ff14..1c7d1c89768 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -26,7 +26,7 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
 try {
-	OC::getRouter()->match('/ocs'.$_SERVER['PATH_INFO']);
+	OC::getRouter()->match('/ocs'.OC_Request::getRawPathInfo());
 } catch (ResourceNotFoundException $e) {
 	OC_OCS::notFound();
 } catch (MethodNotAllowedException $e) {