From 16f3e7146a0729a00bec51a62bcd1d9c38f2921e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 6 Feb 2009 01:15:24 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: bb4fd38c86aee6bed3b4f6bd3ca7dcebe0310c2a Monotone-Revision: 1c1858472d2b9c6f86a8b53da8c5710cf0d6eecd Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-02-06T01:15:24 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 9 +++++++++ UI/MailPartViewers/UIxMailPartHTMLViewer.m | 2 ++ UI/SOGoUI/UIxComponent.m | 1 + 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0446adade..89284073e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-02-05 Francis Lachapelle + + * UI/SOGoUI/UIxComponent.m ([UIxComponent -responseWithStatus:): + we now set the content-type to "text/plain" to fix issues with nginx. + + * UI/MailPartViewers/UIxMailPartHTMLViewer.m + ([UIxMailPartHTMLViewer + -startElement:namespace:rawName:attributes:]): the base tag must be ignored. + 2009-01-22 Ludovic Marcotte * Updated the Apache section in the installation diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m index db38b231d..4942a9dca 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -276,6 +276,8 @@ _xmlCharsetForCharset (NSString *charset) showWhoWeAre(); if (inStyle || inScript) ; + else if ([_localName caseInsensitiveCompare: @"base"] == NSOrderedSame) + ; else if ([_localName caseInsensitiveCompare: @"body"] == NSOrderedSame) inBody = YES; else if ([_localName caseInsensitiveCompare: @"script"] == NSOrderedSame) diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index 29643f56c..936d4e21d 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -603,6 +603,7 @@ static BOOL uixDebugEnabled = NO; response = [context response]; [response setStatus: status]; + [response setHeader: @"text/plain" forKey: @"Content-Type"]; return response; }