summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-07-25 13:18:53 +0200
committerGitHub <noreply@github.com>2016-07-25 13:18:53 +0200
commite51afa1684a0d555082e3115a75dc357a14a9cca (patch)
tree2ad202bd638f0c73da558e3f1201e456c0dceb8a /lib/private
parent88cbde6a665c611c6efd68ad65fec60e5e3dd207 (diff)
parent1b73a630411f375c3250d8c80ff050a3edbd1c35 (diff)
downloadnextcloud-server-e51afa1684a0d555082e3115a75dc357a14a9cca.tar.gz
nextcloud-server-e51afa1684a0d555082e3115a75dc357a14a9cca.zip
Merge pull request #509 from nextcloud/appframework_magic_allow_default_vars
AppFramework add default values (ApiController) as parameters
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 59803d02bee..ab360bf2395 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -330,6 +330,12 @@ class DIContainer extends SimpleContainer implements IAppContainer {
);
});
+ /**
+ * App Framework default arguments
+ */
+ $this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
+ $this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
+ $this->registerParameter('corsMaxAge', 1728000);
/**
* Middleware