From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 11 Mar 2005 22:54:33 +0000 (+0000)
Subject: fixed ordering of propstat responses
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=312728c147b3980a04fe95ae98fa34da90229fc1;p=sope

fixed ordering of propstat responses


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@645 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 8139b5c5..34404b06 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-11  Helge Hess  <helge.hess@opengroupware.org>
+
+	* WebDAV/SoWebDAVRenderer.m: fixed ordering of propstat result elements
+	  (<status/> must come after <prop/>) (v4.5.134)
+
 2005-03-08  Helge Hess  <helge.hess@skyrix.com>
 
 	* DynamicElements/common.h, DynamicElements/*.m: renamed to decommon.h
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index fba1773a..ab606870 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=133
+SUBMINOR_VERSION:=134
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134
diff --git a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
index 61d7e100..720f3c5c 100644
--- a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
@@ -572,12 +572,6 @@ static BOOL         formatOutput = NO;
   }
   
   [r appendContentString:@"<D:propstat>"];
-  if (stat) {
-    [r appendContentString:@"<D:status>"];
-    [r appendContentXMLString:[stat stringValue]];
-    [r appendContentString:@"</D:status>"];
-  }
-  
   [r appendContentString:@"<D:prop>"];
   if (formatOutput) [r appendContentCharacter:'\n'];
   
@@ -652,7 +646,16 @@ static BOOL         formatOutput = NO;
     }
   }
       
-  [r appendContentString:@"</D:prop></D:propstat></D:response>"];
+  [r appendContentString:@"</D:prop>"];
+  if (formatOutput) [r appendContentCharacter:'\n'];
+  
+  if (stat != nil) {
+    [r appendContentString:@"<D:status>"];
+    [r appendContentXMLString:[stat stringValue]];
+    [r appendContentString:@"</D:status>"];
+  }
+  
+  [r appendContentString:@"</D:propstat></D:response>"];
   if (formatOutput) [r appendContentCharacter:'\n'];
 }
 
@@ -930,7 +933,7 @@ static BOOL         formatOutput = NO;
   [r appendContentString:[[_ctx request] uri]];
   [r appendContentString:@"</D:href>"];
   if (formatOutput) [r appendContentCharacter:'\n'];
-  [r appendContentString:@"<D:propstat><D:status>HTTP/1.1 200 OK</D:status>"];
+  [r appendContentString:@"<D:propstat>"];
   if (formatOutput) [r appendContentCharacter:'\n'];
   [r appendContentString:@"<D:prop>"];
   if (formatOutput) [r appendContentCharacter:'\n'];
@@ -952,7 +955,10 @@ static BOOL         formatOutput = NO;
     }
   }
   
-  [r appendContentString:@"</D:prop></D:propstat></D:response>"];
+  [r appendContentString:@"</D:prop>"];
+  if (formatOutput) [r appendContentCharacter:'\n'];
+  [r appendContentString:@"<D:status>HTTP/1.1 200 OK</D:status>"];
+  [r appendContentString:@"</D:propstat></D:response>"];
   if (formatOutput) [r appendContentCharacter:'\n'];
   [r appendContentString:@"</D:multistatus>"];
   if (formatOutput) [r appendContentCharacter:'\n'];