From e3ccfb54aa5f11a01e733b5eb0e10fabf8cc0f98 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Wed, 17 Feb 2010 09:08:16 +0000
Subject: [PATCH] fix for display problem in Firefox on MacOS X

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6677 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/http/server/HTTPDemon.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/source/de/anomic/http/server/HTTPDemon.java b/source/de/anomic/http/server/HTTPDemon.java
index 730e72f08..c1ccd5916 100644
--- a/source/de/anomic/http/server/HTTPDemon.java
+++ b/source/de/anomic/http/server/HTTPDemon.java
@@ -37,7 +37,6 @@ import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -1277,10 +1276,7 @@ public final class HTTPDemon implements serverHandler, Cloneable {
             else headers.put(HeaderFramework.PRAGMA, "no-cache");
         }
         
-        if (contentType == null) 
-            contentType = "text/html; charset=UTF-8";
-        else if (contentType.startsWith("text/") && contentType.toLowerCase().indexOf("charset=")==-1)
-            contentType +="; charset=" + Charset.defaultCharset().name();
+        if (contentType == null) contentType = "text/html; charset=UTF-8";
         headers.put(HeaderFramework.CONTENT_TYPE, contentType);  
         if (contentLength > 0)   headers.put(HeaderFramework.CONTENT_LENGTH, Long.toString(contentLength));
         //if (cookie != null)      headers.put(httpHeader.SET_COOKIE, cookie);