You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/10/06 12:55:07 UTC
svn commit: r1763582 - in /jackrabbit/branches/2.12: ./
jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
Author: reschke
Date: Thu Oct 6 12:55:07 2016
New Revision: 1763582
URL: http://svn.apache.org/viewvc?rev=1763582&view=rev
Log:
JCR-4027: proper handling of missing content type, proper parsing of parameters (ported to 2.12)
Modified:
jackrabbit/branches/2.12/ (props changed)
jackrabbit/branches/2.12/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
Propchange: jackrabbit/branches/2.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 6 12:55:07 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1732436,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422
+/jackrabbit/trunk:1732436,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558
Modified: jackrabbit/branches/2.12/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java?rev=1763582&r1=1763581&r2=1763582&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java Thu Oct 6 12:55:07 2016
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Locale;
import java.util.Set;
import javax.jcr.Item;
@@ -479,8 +480,16 @@ public abstract class JcrRemotingServlet
&& ((WrappingLocator) locator).isJsonRequest;
case DavMethods.DAV_POST:
String ct = request.getContentType();
- return ct.startsWith("multipart/form-data") ||
- ct.startsWith("application/x-www-form-urlencoded");
+ if (ct == null) {
+ return false;
+ } else {
+ int semicolon = ct.indexOf(';');
+ if (semicolon >= 0) {
+ ct = ct.substring(0, semicolon);
+ }
+ ct = ct.trim().toLowerCase(Locale.ENGLISH);
+ return "multipart/form-data".equals(ct) || "application/x-www-form-urlencoded".equals(ct);
+ }
default:
return false;
}