principal-match REPORT vends two response XML elements instead of one

[wsanchez@…]

From Helge:

When requesting missing properties in a principal-match REPORT, iCal server returns two response XML elements with individual propstat's instead of one response element with two propstat's.

REPORT /calendars/users/nat/ 
Depth:0 
 
<?xml version="1.0" encoding="utf-8"?> 
<principal-match xmlns="DAV:" 
xmlns:I="urn:ietf:params:xml:ns:caldav" 
xmlns:C="urn:ietf:params:xml:ns:carddav" 
xmlns:G="http://groupdav.org/" 
xmlns:A="http://calendarserver.org/ns/" 
> 
<self/> 
<prop> 
<displayname/> 
<resourcetype/> 
... 
<A:first-name /> 
... 
---snap--- 
 
gives: 
---snip--- 
<?xml version='1.0' encoding='UTF-8'?> 
<multistatus xmlns='DAV:'> 
<response> 
<href>/principals/users/nat/</href> 
<propstat> 
<prop> 
<displayname>Nat!</displayname> 
<resourcetype> 
<collection/> 
<principal/> 
... 
</prop> 
<status>HTTP/1.1 200 OK</status> 
</propstat> 
</response> 
<response> 
<href>/principals/users/nat/</href> 
<propstat> 
<prop> 
<getctag xmlns='http://calendarserver.org/ns/'/> 
... 
</prop> 
<status>HTTP/1.1 404 Not Found</status> 
</propstat> 
</response> 
</multistatus> 

[wsanchez@…]

Cyrus notes:

Looks like a generic problem with report_common.responseForHref where it separate outs the good/bad propstats into separate davxml.PropertyStatusResponse elements. The normal PROPFIND behavior aggregates the good/bad propstats into one davxml.PropertyStatusResponse element.

[helge@…]

Yes, as discussed with Cyrus, the DAV:expand-property REPORT shows the same issue.

[sagen@…]

Fixed in calendar server trunk, rev 3578

[wsanchez@…]

r3578

[kurt.leubner@…]

Cc Me!