diff --git a/htdocs/caldav.php b/htdocs/caldav.php index eb4f0b36..12fc3078 100644 --- a/htdocs/caldav.php +++ b/htdocs/caldav.php @@ -9,8 +9,8 @@ * @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later */ require_once('../inc/always.php'); -dbg_error_log( 'caldav', ' User agent: %s', ((isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'Unfortunately Mulberry does not send a "User-agent" header with its requests :-(')) ); -dbg_log_array( 'headers', '_SERVER', $_SERVER, true ); +// dbg_error_log( 'caldav', ' User agent: %s', ((isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'Unfortunately Mulberry does not send a "User-agent" header with its requests :-(')) ); +// dbg_log_array( 'headers', '_SERVER', $_SERVER, true ); require_once('HTTPAuthSession.php'); $session = new HTTPAuthSession(); @@ -50,14 +50,7 @@ if ( ! ($request->IsPrincipal() || isset($request->collection) || $request->meth switch ( $request->method ) { case 'OPTIONS': include_once('caldav-OPTIONS.php'); break; case 'REPORT': include_once('caldav-REPORT.php'); break; - case 'PROPFIND': - if ( isset($c->new_propfind) && $c->new_propfind ) { - include('caldav-PROPFIND2.php'); - } - else { - include('caldav-PROPFIND.php'); - } - break; + case 'PROPFIND': include('caldav-PROPFIND.php'); break; case 'PROPPATCH': include('caldav-PROPPATCH.php'); break; case 'MKCALENDAR': include('caldav-MKCOL.php'); break; case 'MKCOL': include('caldav-MKCOL.php'); break; diff --git a/testing/run_regressions.sh b/testing/run_regressions.sh index 7b3270f0..8f178fae 100755 --- a/testing/run_regressions.sh +++ b/testing/run_regressions.sh @@ -34,7 +34,7 @@ check_result() { cat "${REGRESSION}/diffs/${TEST}" echo "=======================================" if [ "${ACCEPT_ALL}" = "" ] ; then - read -p "[${TEST}] Accept new result [e/r/v/x/y/N]? " ACCEPT + read -p "[${TEST}] Accept new result [e/r/v/f/x/y/N]? " ACCEPT else ACCEPT=${ACCEPT_ALL} fi diff --git a/testing/tests/regression-suite/002-Mulberry-1.result b/testing/tests/regression-suite/002-Mulberry-1.result index 3a7cae39..5264f740 100644 --- a/testing/tests/regression-suite/002-Mulberry-1.result +++ b/testing/tests/regression-suite/002-Mulberry-1.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT -ETag: "90e547688ba83623d3ba31c810afa04f" -Content-Length: 1880 +ETag: "720b3f15e6cc47ad26bb3047340f05a8" +Content-Length: 359 Content-Type: text/xml; charset="utf-8" @@ -21,74 +21,4 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/ - - - - httpd/unix-directory - - - - - - HTTP/1.1 200 OK - - - - /caldav.php/manager1/ - - - - httpd/unix-directory - - - - - - HTTP/1.1 200 OK - - - - /caldav.php/assistant1/ - - - - httpd/unix-directory - - - - - - HTTP/1.1 200 OK - - - - /caldav.php/resource1/ - - - - httpd/unix-directory - - - - - - HTTP/1.1 200 OK - - - - /caldav.php/resource2/ - - - - httpd/unix-directory - - - - - - HTTP/1.1 200 OK - - diff --git a/testing/tests/regression-suite/003-Mulberry-1.result b/testing/tests/regression-suite/003-Mulberry-1.result index cee9f657..906fd41c 100644 --- a/testing/tests/regression-suite/003-Mulberry-1.result +++ b/testing/tests/regression-suite/003-Mulberry-1.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH -ETag: "16e4fc0882e84f344fcd98d73f4c80b8" -Content-Length: 1441 +ETag: "9c4b160fa7eb31181d61f76632747b73" +Content-Length: 1532 Content-Type: text/xml; charset="utf-8" @@ -12,7 +12,6 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/ - httpd/unix-directory @@ -21,6 +20,12 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + + + + HTTP/1.1 404 Not Found + /caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/005-Mulberry-1.result b/testing/tests/regression-suite/005-Mulberry-1.result index 6efb930f..b10fd5af 100644 --- a/testing/tests/regression-suite/005-Mulberry-1.result +++ b/testing/tests/regression-suite/005-Mulberry-1.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH -ETag: "70a2c10638aba9246da7a22db61cbbed" -Content-Length: 1751 +ETag: "742b769399effa71f619302b6ee9897e" +Content-Length: 1842 Content-Type: text/xml; charset="utf-8" @@ -12,7 +12,6 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/ - httpd/unix-directory @@ -21,6 +20,12 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + + + + HTTP/1.1 404 Not Found + /caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result index 1dea444a..acd369ef 100644 --- a/testing/tests/regression-suite/522-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/522-iCal-PROPFIND.result @@ -1,103 +1,7 @@ -HTTP/1.1 207 Multi-Status +HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH -ETag: "e8148ec1b3d334d502d8817f4d424609" -Content-Length: 2362 -Content-Type: text/xml; charset="utf-8" +Content-Length: 0 +Content-Type: text/html - - - - /caldav.php/user2/ - - - User 2 - - - - - - HTTP/1.1 200 OK - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user2/home/ - - - - - - - user2 home - "876883ebf6e5e80fb501f490c70803b5" - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user2/calendar-proxy-read/ - - - - - - - /user2/calendar-proxy-read/ - "19a2e9eecca4a20bb93c23c0ab653d77" - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user2/calendar-proxy-write/ - - - - - - - /user2/calendar-proxy-write/ - "f9ade6a8d81cbc6a7a7b932981955bb4" - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - diff --git a/testing/tests/regression-suite/524-iCal-PROPFIND.result b/testing/tests/regression-suite/524-iCal-PROPFIND.result index 7458f3d4..2215e272 100644 --- a/testing/tests/regression-suite/524-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/524-iCal-PROPFIND.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH -ETag: "0cbae0574458159ed341d1750dc67471" -Content-Length: 3536 +ETag: "86df83ebd0ba52ce21323daecf0012f5" +Content-Length: 3512 Content-Type: text/xml; charset="utf-8" @@ -17,11 +17,8 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/teamclient1/ - /caldav.php/user1/calendar-proxy-read/ - /caldav.php/assistant1/calendar-proxy-read/ HTTP/1.1 200 OK @@ -29,6 +26,7 @@ Content-Type: text/xml; charset="utf-8" + @@ -44,6 +42,14 @@ Content-Type: text/xml; charset="utf-8" + + /caldav.php/user1/ + /caldav.php/teamclient1/ + /caldav.php/assistant1/ + + + /caldav.php/teamclient1/ + manager1 home "c240642ddef994358c96da82c0361a58" @@ -51,8 +57,6 @@ Content-Type: text/xml; charset="utf-8" - - @@ -75,11 +79,10 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/ /caldav.php/teamclient1/ + /caldav.php/assistant1/ /caldav.php/teamclient1/ - /caldav.php/user1/calendar-proxy-read/ - /caldav.php/assistant1/calendar-proxy-read/ /manager1/calendar-proxy-read/ "81833b8410a85c2e86dd32ae4470e72b" @@ -108,12 +111,12 @@ Content-Type: text/xml; charset="utf-8" + /caldav.php/user1/ + /caldav.php/teamclient1/ /caldav.php/assistant1/ /caldav.php/teamclient1/ - /caldav.php/user1/calendar-proxy-read/ - /caldav.php/assistant1/calendar-proxy-read/ /manager1/calendar-proxy-write/ "9849062cdad5f238a4ac4a9829bcdbcf" diff --git a/testing/tests/regression-suite/532-iCal4-PROPFIND.result b/testing/tests/regression-suite/532-iCal4-PROPFIND.result index 000a2dfd..0d2c4c7d 100644 --- a/testing/tests/regression-suite/532-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/532-iCal4-PROPFIND.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH -ETag: "9bed52e80a9d357b9e65d7a068fd1848" -Content-Length: 9691 +ETag: "ed81b97302f91b92d56088543e8d8ee9" +Content-Length: 9884 Content-Type: text/xml; charset="utf-8" @@ -17,6 +17,11 @@ Content-Type: text/xml; charset="utf-8" + + /caldav.php/user1/home/ + /caldav.php/user1/created/ + /caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/ + @@ -62,7 +67,6 @@ Content-Type: text/xml; charset="utf-8" - diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result index d3a2a14b..56052f00 100644 --- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result +++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result @@ -12,7 +12,7 @@ user1 home Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "735679d819034badbcddd8aa6029bc3d" diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.test b/testing/tests/regression-suite/820-Spec-PROPFIND-1.test index 5e6a4411..9ded9a14 100644 --- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.test +++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.test @@ -7,7 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml -REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result index 304fc583..beb556bf 100644 --- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result +++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result @@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD ETag: "deadbeefcafefeeddeadbeefcafefeed" -Content-Length: 1102 +Content-Length: 1098 Content-Type: text/xml; charset="utf-8" @@ -20,7 +20,7 @@ Content-Type: text/xml; charset="utf-8" user1 home Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "735679d819034badbcddd8aa6029bc3d" diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.test b/testing/tests/regression-suite/821-Spec-PROPFIND-2.test index 0a00b2ee..88fe7913 100644 --- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.test +++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.test @@ -10,7 +10,7 @@ HEADER=Content-Type: application/xml HEAD -REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result index 5ab5d431..022355c0 100644 --- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result +++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result @@ -12,7 +12,7 @@ user1 home Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "735679d819034badbcddd8aa6029bc3d" @@ -47,7 +47,7 @@ Lunch with David Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "2c32a2f8aba853654eb17fe037a4db4d" @@ -82,7 +82,7 @@ A Meeting Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "c3658901fd4689d4a1e1d6f08601ef4f" @@ -117,7 +117,7 @@ Weekly Project Meeting Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "a1c6404d61190f9574e2bfd69383f144" @@ -152,7 +152,7 @@ Confidential Event Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "08a435c2abaf38f4a50a997343c098a7" @@ -187,7 +187,7 @@ Private Event Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "5def8ae2b20893a1c7f4dbaeb008f2f1" @@ -222,7 +222,7 @@ Tentative Event Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "ac90acd649c25070b1a2a17fb31a105a" @@ -257,7 +257,7 @@ Incomplete, uncancelled Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "509b0f0d8a3363379f9f5727f5dd74a0" @@ -292,7 +292,7 @@ 50% Complete, uncancelled Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "cb3d9dc3e8c157f53eba3ea0e1e0f146" @@ -327,7 +327,7 @@ Due 7/8/7 16:30, completed Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "00ad5eb1eb5507884710b0b66aa5d5c4" @@ -362,7 +362,7 @@ A Cancelled Task, with a start and due date Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "a2990674708634a311bb98a59865ca50" @@ -397,7 +397,7 @@ Morning Meeting Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "e8060931f30c1798ac58ffbe4ec0bffc" @@ -432,7 +432,7 @@ Release 0.9.3 Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "8f581a053df6d833254756dfd7553d37" @@ -467,7 +467,7 @@ Beer O'Clock Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "0d7a68984bf525342d22b8924a57e8e2" @@ -502,7 +502,7 @@ Morning Mgmt Mtg Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "421abf7e4848d2fecbf64217ed205d4b" @@ -537,7 +537,7 @@ BBQ @ ML's Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "5f050eca5480bbebbe9428222570913d" @@ -572,7 +572,7 @@ New Event Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "257b9df4aaf573a578af4aadd033abf4" @@ -607,7 +607,7 @@ Party all day! Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "165746adbab8bc0c8336a63cc5332ff2" @@ -642,7 +642,7 @@ Woohoo! Time to Par-tay! Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "8600dc4a1b264a09a5f741d710497cba" diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.test b/testing/tests/regression-suite/822-Spec-PROPFIND-3.test index c33f2389..16218ee6 100644 --- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.test +++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.test @@ -7,7 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: infinity HEADER=Content-Type: application/xml -REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result index a9d2a50e..40b23e3a 100644 --- a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result +++ b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result @@ -9,7 +9,7 @@ Morning Mgmt Mtg Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "421abf7e4848d2fecbf64217ed205d4b" diff --git a/testing/tests/regression-suite/823-Spec-PROPFIND-4.test b/testing/tests/regression-suite/823-Spec-PROPFIND-4.test index 8b8a8dbe..e76fbed2 100644 --- a/testing/tests/regression-suite/823-Spec-PROPFIND-4.test +++ b/testing/tests/regression-suite/823-Spec-PROPFIND-4.test @@ -7,6 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result index 5df20e9b..ad974b1a 100644 --- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result +++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result @@ -12,7 +12,7 @@ user1 home Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "735679d819034badbcddd8aa6029bc3d" diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.test b/testing/tests/regression-suite/824-Spec-PROPFIND-5.test index 3a0afe41..55f59c66 100644 --- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.test +++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.test @@ -7,6 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/825-Spec-PROPFIND-6.result b/testing/tests/regression-suite/825-Spec-PROPFIND-6.result index d5e7f25d..3564b2de 100644 --- a/testing/tests/regression-suite/825-Spec-PROPFIND-6.result +++ b/testing/tests/regression-suite/825-Spec-PROPFIND-6.result @@ -9,7 +9,7 @@ Morning Mgmt Mtg Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "421abf7e4848d2fecbf64217ed205d4b" diff --git a/testing/tests/regression-suite/825-Spec-PROPFIND-6.test b/testing/tests/regression-suite/825-Spec-PROPFIND-6.test index 4088783d..463dabeb 100644 --- a/testing/tests/regression-suite/825-Spec-PROPFIND-6.test +++ b/testing/tests/regression-suite/825-Spec-PROPFIND-6.test @@ -7,6 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/826-Spec-PROPFIND.result b/testing/tests/regression-suite/826-Spec-PROPFIND.result index daad62a0..9c85b326 100644 --- a/testing/tests/regression-suite/826-Spec-PROPFIND.result +++ b/testing/tests/regression-suite/826-Spec-PROPFIND.result @@ -11,7 +11,7 @@ DAViCal CalDAV Server - YYYYMMDDThhmmss + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "38f09ba341cd927809b571496db6e4c3" diff --git a/testing/tests/regression-suite/826-Spec-PROPFIND.test b/testing/tests/regression-suite/826-Spec-PROPFIND.test index ceaeff35..289d6468 100644 --- a/testing/tests/regression-suite/826-Spec-PROPFIND.test +++ b/testing/tests/regression-suite/826-Spec-PROPFIND.test @@ -7,7 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml -REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/827-Spec-PROPFIND.result b/testing/tests/regression-suite/827-Spec-PROPFIND.result index 4a8c048c..9c85b326 100644 --- a/testing/tests/regression-suite/827-Spec-PROPFIND.result +++ b/testing/tests/regression-suite/827-Spec-PROPFIND.result @@ -11,7 +11,7 @@ DAViCal CalDAV Server - YYYYMMDDThhmmss + YYYY-MM-DDThh:mm:ss+ZZ:ZZ "38f09ba341cd927809b571496db6e4c3" @@ -46,239 +46,4 @@ HTTP/1.1 404 Not Found - - /caldav.php/user1/ - - - - - - - - - - - - Dow, 01 Jan 2000 00:00:00 GMT - User 1 - - - httpd/unix-directory - Dow, 01 Jan 2000 00:00:00 GMT - - - - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/manager1/ - - - - - - - - - - - - Dow, 01 Jan 2000 00:00:00 GMT - Manager 1 - - - httpd/unix-directory - Dow, 01 Jan 2000 00:00:00 GMT - - - - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/assistant1/ - - - - - - - - - - - - Dow, 01 Jan 2000 00:00:00 GMT - Assistant 1 - - - httpd/unix-directory - Dow, 01 Jan 2000 00:00:00 GMT - - - - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/resource1/ - - - - - - - - - - - - Dow, 01 Jan 2000 00:00:00 GMT - Resource 1 - - - httpd/unix-directory - Dow, 01 Jan 2000 00:00:00 GMT - - - - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/resource2/ - - - - - - - - - - - - Dow, 01 Jan 2000 00:00:00 GMT - Resource 2 - - - httpd/unix-directory - Dow, 01 Jan 2000 00:00:00 GMT - - - - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - HTTP/1.1 404 Not Found - - diff --git a/testing/tests/regression-suite/827-Spec-PROPFIND.test b/testing/tests/regression-suite/827-Spec-PROPFIND.test index b1e0a61f..4596f1d4 100644 --- a/testing/tests/regression-suite/827-Spec-PROPFIND.test +++ b/testing/tests/regression-suite/827-Spec-PROPFIND.test @@ -7,7 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 1 HEADER=Content-Type: application/xml -REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/862-Spec-REPORT-principal.result b/testing/tests/regression-suite/862-Spec-REPORT-principal.result index 04929d9d..e7557835 100644 --- a/testing/tests/regression-suite/862-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/862-Spec-REPORT-principal.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT -ETag: "1eec1599c7beefc169bc00e1834dafa3" -Content-Length: 971 +ETag: "f58718d47e33b0a952219bb94caee446" +Content-Length: 816 Content-Type: text/xml; charset="utf-8" @@ -24,17 +24,18 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/ - /caldav.php/resmgr1/ /caldav.php/teamclient1/ - /caldav.php/manager1/calendar-proxy-read/ - /caldav.php/assistant1/calendar-proxy-read/ - /caldav.php/resource1/calendar-proxy-write/ - /caldav.php/resource2/calendar-proxy-write/ HTTP/1.1 200 OK + + + + + HTTP/1.1 404 Not Found + diff --git a/testing/tests/regression-suite/863-Spec-REPORT-principal.result b/testing/tests/regression-suite/863-Spec-REPORT-principal.result index bcf0799f..94344d99 100644 --- a/testing/tests/regression-suite/863-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/863-Spec-REPORT-principal.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT -ETag: "d047d6bb34fe6e227afcb6ca4336883b" -Content-Length: 923 +ETag: "725f2713529ca881526736b9dae5a92a" +Content-Length: 776 Content-Type: text/xml; charset="utf-8" @@ -29,10 +29,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user2/ /caldav.php/assistant1/ - - /caldav.php/resource1/calendar-proxy-write/ - /caldav.php/resource2/calendar-proxy-write/ - + HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/870-Principal-PROPFIND.result b/testing/tests/regression-suite/870-Principal-PROPFIND.result index 05c14848..f8cabedd 100644 --- a/testing/tests/regression-suite/870-Principal-PROPFIND.result +++ b/testing/tests/regression-suite/870-Principal-PROPFIND.result @@ -13,10 +13,9 @@ - Dow, 01 Jan 2000 00:00:00 GMT + YYYY-MM-DDThh:mm:ss+ZZ:ZZ User 1 - httpd/unix-directory Dow, 01 Jan 2000 00:00:00 GMT @@ -38,6 +37,7 @@ + diff --git a/testing/tests/regression-suite/870-Principal-PROPFIND.test b/testing/tests/regression-suite/870-Principal-PROPFIND.test index a98088fc..c1d5f65d 100644 --- a/testing/tests/regression-suite/870-Principal-PROPFIND.test +++ b/testing/tests/regression-suite/870-Principal-PROPFIND.test @@ -7,7 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml -REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# +REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result index 3502a48c..bb9750b8 100644 --- a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result +++ b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT -ETag: "8498716b46690758ce031acc2e8605dd" -Content-Length: 4642 +ETag: "347b2ac9ab4fb77de6f07f6d20b67fcb" +Content-Length: 1030 Content-Type: text/xml; charset="utf-8" @@ -38,159 +38,4 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 404 Not Found - - /caldav.php/user1/ - - - User 1 - - - - - httpd/unix-directory - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/manager1/ - - - Manager 1 - - - - - httpd/unix-directory - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/assistant1/ - - - Assistant 1 - - - - - httpd/unix-directory - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/resource1/ - - - Resource 1 - - - - - httpd/unix-directory - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/resource2/ - - - Resource 2 - - - - - httpd/unix-directory - - - - - - - HTTP/1.1 200 OK - - - - - - - - - - - - HTTP/1.1 404 Not Found - - diff --git a/testing/tests/regression-suite/912-Space-PROPFIND.result b/testing/tests/regression-suite/912-Space-PROPFIND.result index 2647025f..acd369ef 100644 --- a/testing/tests/regression-suite/912-Space-PROPFIND.result +++ b/testing/tests/regression-suite/912-Space-PROPFIND.result @@ -1,126 +1,7 @@ -HTTP/1.1 207 Multi-Status +HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH -ETag: "c73f9be8b8862552e7cf90dbe97ca4f9" -Content-Length: 2992 -Content-Type: text/xml; charset="utf-8" +Content-Length: 0 +Content-Type: text/html - - - - /caldav.php/User%20Six/ - - - User 6 - - - - - - HTTP/1.1 200 OK - - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/User%20Six/home/ - - - - - - - User Six home - "759d51f273f3a052dc930a6795f6e070" - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/User%20Six/DEADBEEF-EFD9-4F0F-9BDC-5335E04D47E0/ - - - - - - - Space Calendar - "d0711d9c33f6c22359ee83adb7751cda" - #391B71A0 - - HTTP/1.1 200 OK - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/User%20Six/calendar-proxy-read/ - - - - - - - /User Six/calendar-proxy-read/ - "7032a440adf6aaab2a81cd3bc214d153" - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/User%20Six/calendar-proxy-write/ - - - - - - - /User Six/calendar-proxy-write/ - "d729246362363c87ec3d13d6eaa99efa" - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - diff --git a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.test index a80a74b6..4a7a5c14 100644 --- a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.test @@ -17,6 +17,7 @@ BEGINDATA + ENDDATA diff --git a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.test index 8d365f60..be9459b6 100644 --- a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.test @@ -17,6 +17,7 @@ BEGINDATA + ENDDATA diff --git a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.test index 2d017e49..f90f9c54 100644 --- a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.test @@ -17,6 +17,7 @@ BEGINDATA + ENDDATA diff --git a/testing/tests/regression-suite/921-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/921-PROPFIND-supported-stuff.test index 5641bc4c..dab9e1e3 100644 --- a/testing/tests/regression-suite/921-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/921-PROPFIND-supported-stuff.test @@ -19,6 +19,7 @@ BEGINDATA + ENDDATA diff --git a/testing/tests/regression-suite/923-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/923-PROPFIND-supported-stuff.test index d347b5a9..91f31726 100644 --- a/testing/tests/regression-suite/923-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/923-PROPFIND-supported-stuff.test @@ -19,6 +19,7 @@ BEGINDATA + ENDDATA