From 9f4d7c4b6cba4ad8c4d629ea539c31dc38a5d400 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 17 Mar 2008 18:47:06 +0000 Subject: [PATCH] Monotone-Parent: 2faf999531ce61df1885728986fff22f2b832e2c Monotone-Revision: 590043c9e51afb45bb22792df999cd93c7359074 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-03-17T18:47:06 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/SOGo/SOGoObject.m | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2af91ff5..d4ee326e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-17 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoObject.m ([SOGoObject + -davAclQuery:queryContext]): declare the "text/xml" mime type only + when the content is not empty. Otherwise, returns no mime type at + all and set the status code to 204. + 2008-03-10 Wolfgang Sourdeau * UI/Scheduler/UIxCalMonthViewOld.m ([UIxCalMonthViewOld diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index 84d69356b..a4e0c227d 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -1319,7 +1319,6 @@ static BOOL sendACLAdvisories = NO; r = [queryContext response]; [r setContentEncoding: NSUTF8StringEncoding]; - [r setHeader: @"text/xml; charset=\"utf-8\"" forKey: @"content-type"]; [r setHeader: @"no-cache" forKey: @"pragma"]; [r setHeader: @"no-cache" forKey: @"cache-control"]; @@ -1327,12 +1326,15 @@ static BOOL sendACLAdvisories = NO; content = [self _davAclActionFromQuery: document]; if (content) { - [r setStatus: 207]; if ([content length]) { + [r setStatus: 207]; + [r setHeader: @"text/xml; charset=\"utf-8\"" forKey: @"content-type"]; [r appendContentString: @"\r\n"]; [r appendContentString: content]; } + else + [r setStatus: 204]; } else [r setStatus: 400];