You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/10/28 10:21:49 UTC

git commit: MARMOTTA-557: Relaxed CORS configuration: allow 'PATCH' and all headers for CORS requests.

Repository: marmotta
Updated Branches:
  refs/heads/develop af18d1652 -> 2a5a66163


MARMOTTA-557: Relaxed CORS configuration: allow 'PATCH' and all headers for CORS requests.

Updated CORS library to 2.1.1: L&N checked, no changes required.


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2a5a6616
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2a5a6616
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2a5a6616

Branch: refs/heads/develop
Commit: 2a5a661630c387b0616f5f6874520eb4c34bcd25
Parents: af18d16
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Oct 28 10:19:05 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Oct 28 10:21:30 2014 +0100

----------------------------------------------------------------------
 launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml | 7 +------
 parent/pom.xml                                            | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/2a5a6616/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
index d2da2e8..dda81db 100644
--- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
@@ -68,12 +68,7 @@
 
         <init-param>
             <param-name>cors.supportedMethods</param-name>
-            <param-value>GET, HEAD, POST, PUT, DELETE, OPTIONS</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>cors.supportedHeaders</param-name>
-            <param-value>Origin, Accept, Content-Type</param-value>
+            <param-value>GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS</param-value>
         </init-param>
 
     </filter>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/2a5a6616/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e5c9208..14beafa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1695,7 +1695,7 @@
             <dependency>
                 <groupId>com.thetransactioncompany</groupId>
                 <artifactId>cors-filter</artifactId>
-                <version>1.9</version>
+                <version>2.1.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.servlet</groupId>