You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/05/26 11:08:34 UTC
svn commit: r409600 -
/jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java
Author: jukka
Date: Fri May 26 02:08:34 2006
New Revision: 409600
URL: http://svn.apache.org/viewvc?rev=409600&view=rev
Log:
1.0: Merged revision 407604: JCR-422
Modified:
jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java
Modified: jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java?rev=409600&r1=409599&r2=409600&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java (original)
+++ jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/server/io/IOUtil.java Fri May 26 02:08:34 2006
@@ -111,7 +111,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;
}
@@ -154,10 +154,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;
}