Monotone-Parent: 2faf999531ce61df1885728986fff22f2b832e2c

Monotone-Revision: 590043c9e51afb45bb22792df999cd93c7359074

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-03-17T18:47:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-03-17 18:47:06 +00:00
parent cfee388173
commit 9f4d7c4b6c
2 changed files with 11 additions and 2 deletions
+7
View File
@@ -1,3 +1,10 @@
2008-03-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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 <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalMonthViewOld.m ([UIxCalMonthViewOld
+4 -2
View File
@@ -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: @"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n"];
[r appendContentString: content];
}
else
[r setStatus: 204];
}
else
[r setStatus: 400];