You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/05/18 20:28:09 UTC

svn commit: r407604 - /jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java

Author: angela
Date: Thu May 18 11:28:08 2006
New Revision: 407604

URL: http://svn.apache.org/viewvc?rev=407604&view=rev
Log:
JCR-422: charset in Content-Type header shouldn't be in quotes

Modified:
    jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java

Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java?rev=407604&r1=407603&r2=407604&view=diff
==============================================================================
--- jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java (original)
+++ jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java Thu May 18 11:28:08 2006
@@ -112,7 +112,7 @@
     public static String buildContentType(String mimeType, String encoding) {
         String contentType = mimeType;
         if (contentType != null && encoding != null) {
-            contentType += "; charset=\"" + encoding + "\"";
+            contentType += "; charset=" + encoding;
         }
         return contentType;
     }
@@ -155,10 +155,6 @@
         int semi = encoding.indexOf(";");
         if (semi != -1) {
             encoding = encoding.substring(0, semi);
-        }
-        // strip off enclosing quotes
-        if (encoding.startsWith("\"") || encoding.startsWith("'")) {
-            encoding = encoding.substring(1, encoding.length() - 1);
         }
         return encoding;
     }