mirror of
https://gitlab.com/davical-project/davical.git
synced 2026-01-28 00:43:37 +00:00
update tests for changed etags, unstable REV/UID or sort order, improved property parsing
Changed line wrapping in awl is one major reason for etag changes. With this commit, all tests in regression-suite, binding and carddav pass for me, using the configuration outlined in README.regression_tests
This commit is contained in:
parent
0cab01f390
commit
44ff0b3286
@ -62,6 +62,8 @@ former) with
|
||||
$c->public_freebusy_url = true;
|
||||
// helps with 1035-GET-mashup
|
||||
$c->get_includes_subcollections = true;
|
||||
// helps with 1036-REPORT-sync-initial-bound
|
||||
$c->hide_TODO = false;
|
||||
|
||||
// for ischedule suite; also needs DKIM set up?
|
||||
$c->enable_scheduling = true;
|
||||
|
||||
@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
|
||||
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
Etag: "ae93907cb03bc025b8e733eb61f3a09e"
|
||||
Content-Length: 21514
|
||||
Content-Length: 21878
|
||||
Content-Type: text/calendar; charset="utf-8"
|
||||
|
||||
BEGIN:VCALENDAR
|
||||
@ -715,4 +715,19 @@ DTSTART:19701004T020000
|
||||
RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
|
||||
END:DAYLIGHT
|
||||
END:VTIMEZONE
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:(UTC-05:00) Eastern Time (US & Canada)
|
||||
BEGIN:STANDARD
|
||||
DTSTART:16010101T020000
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11
|
||||
END:STANDARD
|
||||
BEGIN:DAYLIGHT
|
||||
DTSTART:16010101T020000
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=2SU;BYMONTH=3
|
||||
END:DAYLIGHT
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "4024ce3f5ccba7c419bf247a4632801e"
|
||||
ETag: "d6665c63cf6dc79c4c69923f41a92a56"
|
||||
Content-Length: 2302
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -84,7 +84,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user4/user2/70399cd7-50a4-4be4-a665-af593e19a7fd.ics</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<getetag>"ea6b316ca24db20f5eb37d1abd60f8c1"</getetag>
|
||||
<getetag>"1c0b818bc0f1266a07e7759164eb894b"</getetag>
|
||||
</prop>
|
||||
<status>HTTP/1.1 200 OK</status>
|
||||
</propstat>
|
||||
|
||||
@ -4,14 +4,13 @@ HTTP/1.1 201 Created
|
||||
Date: Dow, 01 Jan 2000 00:00:00 GMT
|
||||
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "24bae2a7f81c0a79413a656c06d8326b"
|
||||
Content-Length: 0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
|
||||
|
||||
caladruri: >mailto:andrew@morphoss.com<
|
||||
caluri: >https://dotcal.com/karora<
|
||||
dav_etag: >24bae2a7f81c0a79413a656c06d8326b<
|
||||
dav_etag: >a81fa8394d866e6037ea426554663e4c<
|
||||
dav_name: >/user1/addressbook/andrew_mcmillan.vcf<
|
||||
fburl: >https://davical.morphoss.com/freebusy.php/andrew@morphoss.com<
|
||||
fn: >Andrew Watson McMillan<
|
||||
|
||||
@ -9,22 +9,6 @@ Content-Length: 0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
|
||||
|
||||
caldav_data: >BEGIN:VCARD
|
||||
FN:Donald Kelly
|
||||
N:Kelly;Donald;;;
|
||||
ORG:Esposo Designs Ltd
|
||||
ADR:;;25 Rintoul St;Newtown;Wellington;;New Zealand
|
||||
EMAIL;TYPE=internet:donald@example.co.nz
|
||||
TITLE:Proprietor
|
||||
TEL;TYPE=work:+64 4 347 4747
|
||||
TEL;TYPE=cell:+64 2 1234-4321
|
||||
X-MOZILLA-HTML:TRUE
|
||||
URL:www.example.co.nz
|
||||
VERSION:2.1
|
||||
UID:09e62b3e-656d-c4c4-a5f9-b73422a2f8eb
|
||||
REV:20130927T145926Z
|
||||
END:VCARD
|
||||
<
|
||||
dav_id: >1636<
|
||||
|
||||
caladruri: >NULL<
|
||||
|
||||
@ -28,7 +28,7 @@ end:vcard
|
||||
ENDDATA
|
||||
|
||||
QUERY
|
||||
SELECT caldav_data.caldav_data, caldav_data.dav_id FROM caldav_data WHERE caldav_data.dav_name ~ '/user1/addressbook/donald_kelly.vcf'
|
||||
SELECT caldav_data.dav_id FROM caldav_data WHERE caldav_data.dav_name ~ '/user1/addressbook/donald_kelly.vcf'
|
||||
ENDQUERY
|
||||
|
||||
QUERY
|
||||
|
||||
@ -2,14 +2,13 @@ HTTP/1.1 201 Created
|
||||
Date: Dow, 01 Jan 2000 00:00:00 GMT
|
||||
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "70da8e376791d07c9fae3dbda0b40314"
|
||||
Content-Length: 0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
|
||||
|
||||
caladruri: >NULL<
|
||||
caluri: >NULL<
|
||||
dav_etag: >70da8e376791d07c9fae3dbda0b40314<
|
||||
dav_etag: >53569ce581d6eac27ee6411858f018c9<
|
||||
dav_name: >/user1/addressbook/PHRsMa4mvY.vcf<
|
||||
fburl: >NULL<
|
||||
fn: >zzz<
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "e722f053aaa9eef890641a0ba88837e5"
|
||||
ETag: "7eee7e2a739c70ec701eee0216f4c8b6"
|
||||
Content-Length: 339
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -12,12 +12,12 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user1/addressbook/</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<C:getctag>"80a8bc51f0e0b0fdd2037f1e12f5ad47"</C:getctag>
|
||||
<C:getctag>"7d856384c7967b25c3240b4c23418445"</C:getctag>
|
||||
</prop>
|
||||
<status>HTTP/1.1 200 OK</status>
|
||||
</propstat>
|
||||
</response>
|
||||
</multistatus>
|
||||
|
||||
dav_etag: >80a8bc51f0e0b0fdd2037f1e12f5ad47<
|
||||
dav_etag: >7d856384c7967b25c3240b4c23418445<
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
|
||||
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "a fine looking etag"
|
||||
Content-Length: 2330
|
||||
Content-Length: 2326
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
@ -15,7 +15,6 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
|
||||
<VC:address-data>BEGIN:VCARD
|
||||
VERSION:3.0
|
||||
REV:2010-03-29T09:23:34Z
|
||||
UID:excellent-looking-uid-string
|
||||
X-SKYPE;X-EVOLUTION-UI-SLOT=1;TYPE=HOME:karora__
|
||||
X-JABBER;X-EVOLUTION-UI-SLOT=3;TYPE=HOME:karora@irc.oftc.net
|
||||
@ -47,6 +46,7 @@ ROLE:Geek
|
||||
ORG:dotCal;;Porirua
|
||||
TITLE:Chief Technology Officer
|
||||
URL:http://andrew.mcmillan.net.nz/
|
||||
REV:YYYYMMDDTHHMMSSZ
|
||||
END:VCARD
|
||||
</VC:address-data>
|
||||
</prop>
|
||||
|
||||
@ -2,14 +2,13 @@ HTTP/1.1 201 Created
|
||||
Date: Dow, 01 Jan 2000 00:00:00 GMT
|
||||
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "3419498c6e5eae71dc1704f1787faf1c"
|
||||
Content-Length: 0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
|
||||
|
||||
caladruri: >NULL<
|
||||
caluri: >NULL<
|
||||
dav_etag: >3419498c6e5eae71dc1704f1787faf1c<
|
||||
dav_etag: >8502d23950f2d3d0a554e6a3b248f59a<
|
||||
dav_name: >/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf<
|
||||
fburl: >NULL<
|
||||
fn: >Morphoss Ltd<
|
||||
|
||||
@ -9,7 +9,7 @@ Content-Type: text/plain; charset="utf-8"
|
||||
|
||||
caladruri: >NULL<
|
||||
caluri: >NULL<
|
||||
dav_etag: >1a8abbb93e4ed5f770986687343de804<
|
||||
dav_etag: >052d8a5d1fa786332e5a6c7ad843a1d4<
|
||||
dav_name: >/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf<
|
||||
fburl: >NULL<
|
||||
fn: >Morphoss Ltd<
|
||||
|
||||
@ -6,7 +6,7 @@ URL=http://regression.host/caldav.php/user1/addressbook/F06EC844-EACD-4ADF-8823-
|
||||
|
||||
HEADER=User-Agent: DAViCalTester/public
|
||||
HEADER=Content-Type: text/vcard; charset=utf-8
|
||||
HEADER=If-Match: "3419498c6e5eae71dc1704f1787faf1c"
|
||||
HEADER=If-Match: "8502d23950f2d3d0a554e6a3b248f59a"
|
||||
HEAD
|
||||
|
||||
BEGINDATA
|
||||
|
||||
@ -20,15 +20,15 @@ Content-Type: text/plain; charset="utf-8"
|
||||
url: >NULL<
|
||||
version: >3.0<
|
||||
|
||||
box_no: >NULL<
|
||||
country: >NULL<
|
||||
locality: >NULL<
|
||||
postcode: >NULL<
|
||||
property: >NULL<
|
||||
region: >NULL<
|
||||
street_address: >NULL<
|
||||
type: >NULL<
|
||||
unit_no: >NULL<
|
||||
box_no: ><
|
||||
country: >DE<
|
||||
locality: >Musterhausen<
|
||||
postcode: >12345<
|
||||
property: >ITEM1.ADR;TYPE=WORK;TYPE=pref:;;Musterweg 1a;Musterhausen;;12345;DE<
|
||||
region: ><
|
||||
street_address: >Musterweg 1a<
|
||||
type: >WORK~|~pref<
|
||||
unit_no: ><
|
||||
|
||||
tel: >+49 172 1234567<
|
||||
type: >CELL<
|
||||
|
||||
@ -24,9 +24,9 @@ Content-Type: text/plain; charset="utf-8"
|
||||
country: >NULL<
|
||||
locality: >Irgendwo<
|
||||
postcode: >34332<
|
||||
property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisenstraße 13\\r;Irgendwo;;34332<
|
||||
property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisenstraße 13
;Irgendwo;;34332<
|
||||
region: ><
|
||||
street_address: >Weisenstraße 13\r<
|
||||
street_address: >Weisenstraße 13
<
|
||||
type: >HOME<
|
||||
unit_no: ><
|
||||
|
||||
@ -62,20 +62,14 @@ Content-Type: text/plain; charset="utf-8"
|
||||
type: >X-OTHER<
|
||||
unit_no: ><
|
||||
|
||||
tel: >+49 7363 6363<
|
||||
type: >voice<
|
||||
tel: >+49 8373 6262<
|
||||
type: >VOICE<
|
||||
|
||||
tel: >+49 8383 73 723<
|
||||
type: >voice<
|
||||
tel: >+61 27 28 73 246<
|
||||
type: >VOICE<
|
||||
|
||||
tel: >+49 3377 37 373<
|
||||
type: >voice<
|
||||
|
||||
tel: >+49 8378 33<
|
||||
type: >voice<
|
||||
|
||||
tel: >13355<
|
||||
type: >voice<
|
||||
tel: >+49 9382 3424<
|
||||
type: >FAX<
|
||||
|
||||
tel: >+49 8292 38 383<
|
||||
type: >CAR,VOICE<
|
||||
@ -143,6 +137,21 @@ Content-Type: text/plain; charset="utf-8"
|
||||
tel: >+49 7722 88 28 282<
|
||||
type: >X-EVOLUTION-TELEX<
|
||||
|
||||
tel: >+49 7363 6363<
|
||||
type: >voice<
|
||||
|
||||
tel: >+49 8383 73 723<
|
||||
type: >voice<
|
||||
|
||||
tel: >+49 3377 37 373<
|
||||
type: >voice<
|
||||
|
||||
tel: >+49 8378 33<
|
||||
type: >voice<
|
||||
|
||||
tel: >13355<
|
||||
type: >voice<
|
||||
|
||||
email: >andresen@andresen.de<
|
||||
property: >EMAIL;TYPE=INTERNET:andresen@andresen.de<
|
||||
type: >INTERNET<
|
||||
|
||||
@ -102,16 +102,15 @@ TEL;TYPE=X-EVOLUTION-TELEX:+49 38 288 228 82
|
||||
TEL;TYPE=X-EVOLUTION-TELEX:+49 7722 88 28 282
|
||||
TEL;TYPE=MAIN:+49 6237 623 723 84 76
|
||||
TEL;TYPE=MAIN:+49 9324 32 479 234234
|
||||
TEL;=-EVOLUTION-CALLBACK:+49 8383 73 723
|
||||
TEL;X-EVOLUTION-CALLBACK:+49 8383 73 723
|
||||
TEL;TYPE=MODEM:+49 8383 73 723
|
||||
TEL;=-EVOLUTION-TTYTDD:+49 7373 73
|
||||
TEL;=-EVOLUTION-TTYTDD:+49 8378 33
|
||||
TEL;X-EVOLUTION-TTYTDD:+49 7373 73
|
||||
TEL;X-EVOLUTION-TTYTDD:+49 8378 33
|
||||
ADR;TYPE=WORK;CHARSET=utf-8:
|
||||
;Uni Harburg\, -;Innstraße 71;Hamburg-Harburg;Hamburg;21373;Deutschland
|
||||
|
||||
ADR;TYPE=HOME;CHARSET=utf-8:;;Weisestraße 13\\r;Irgendwo;;33443
|
||||
ADR;TYPE=HOME;CHARSET=utf-8:;;Weisestraße 13
;Irgendwo;;33443
|
||||
ADR;TYPE=X-OTHER:;;Nirgendwo
|
||||
ORG:Uni Harburg\;\;\;033
|
||||
ORG:Uni Harburg;;;033
|
||||
X-ROOM;TYPE=WORK:033
|
||||
LABEL;TYPE=WORK:1. Stock\, links
|
||||
LABEL;TYPE=WORK:oder rechts
|
||||
@ -143,9 +142,9 @@ END:VCARD
|
||||
country: >NULL<
|
||||
locality: >Irgendwo<
|
||||
postcode: >33443<
|
||||
property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisestraße 13\\r;Irgendwo;;33443<
|
||||
property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisestraße 13
;Irgendwo;;33443<
|
||||
region: ><
|
||||
street_address: >Weisestraße 13\r<
|
||||
street_address: >Weisestraße 13
<
|
||||
type: >HOME<
|
||||
unit_no: ><
|
||||
|
||||
@ -170,14 +169,11 @@ END:VCARD
|
||||
type: >X-OTHER<
|
||||
unit_no: ><
|
||||
|
||||
tel: >+49 8383 73 723<
|
||||
type: >voice<
|
||||
tel: >+49 8373 6262<
|
||||
type: >VOICE<
|
||||
|
||||
tel: >+49 7373 73<
|
||||
type: >voice<
|
||||
|
||||
tel: >+49 8378 33<
|
||||
type: >voice<
|
||||
tel: >+49 7272 72<
|
||||
type: >VOICE<
|
||||
|
||||
tel: >+49 8292 38 383<
|
||||
type: >CAR,VOICE<
|
||||
@ -233,6 +229,15 @@ END:VCARD
|
||||
tel: >+49 7722 88 28 282<
|
||||
type: >X-EVOLUTION-TELEX<
|
||||
|
||||
tel: >+49 8383 73 723<
|
||||
type: >voice<
|
||||
|
||||
tel: >+49 7373 73<
|
||||
type: >voice<
|
||||
|
||||
tel: >+49 8378 33<
|
||||
type: >voice<
|
||||
|
||||
email: >hadi@telekom-d.de<
|
||||
type: >INTERNET<
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Content-Type: text/plain; charset="utf-8"
|
||||
country: >Deutschland<
|
||||
locality: >Hamburg<
|
||||
postcode: >22761<
|
||||
property: >ADR;=OME:;;Gayens Weg 9;Hamburg;;22761;Deutschland<
|
||||
property: >ADR;HOME:;;Gayens Weg 9;Hamburg;;22761;Deutschland<
|
||||
region: ><
|
||||
street_address: >Gayens Weg 9<
|
||||
type: >NULL<
|
||||
@ -32,7 +32,7 @@ Content-Type: text/plain; charset="utf-8"
|
||||
country: >Deutschland<
|
||||
locality: >Hamburg<
|
||||
postcode: >20357<
|
||||
property: >ADR;=ORK;CHARSET=UTF-8:;;abcStraße 58;Hamburg;;20357;Deutschland<
|
||||
property: >ADR;WORK;CHARSET=UTF-8:;;abcStraße 58;Hamburg;;20357;Deutschland<
|
||||
region: ><
|
||||
street_address: >abcStraße 58<
|
||||
type: >NULL<
|
||||
|
||||
@ -18,15 +18,25 @@ Content-Type: text/plain; charset="utf-8"
|
||||
url: >NULL<
|
||||
version: >3.0<
|
||||
|
||||
box_no: >NULL<
|
||||
country: >NULL<
|
||||
locality: >NULL<
|
||||
postcode: >NULL<
|
||||
property: >NULL<
|
||||
region: >NULL<
|
||||
street_address: >NULL<
|
||||
type: >NULL<
|
||||
unit_no: >NULL<
|
||||
box_no: ><
|
||||
country: >Deutschland<
|
||||
locality: >Hamburg<
|
||||
postcode: >20357<
|
||||
property: >ITEM1.ADR;TYPE=WORK;TYPE=pref:;;abcStraße 58;Hamburg;;20357;Deutschland<
|
||||
region: ><
|
||||
street_address: >abcStraße 58<
|
||||
type: >WORK~|~pref<
|
||||
unit_no: ><
|
||||
|
||||
box_no: ><
|
||||
country: >Deutschland<
|
||||
locality: >Hamburg<
|
||||
postcode: >22761<
|
||||
property: >ITEM2.ADR;TYPE=HOME:;;Gayens Weg 9;Hamburg;;22761;Deutschland<
|
||||
region: ><
|
||||
street_address: >Gayens Weg 9<
|
||||
type: >HOME<
|
||||
unit_no: ><
|
||||
|
||||
tel: >17799999978200<
|
||||
type: >CELL<
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
|
||||
<getetag>"a81fa8394d866e6037ea426554663e4c"</getetag>
|
||||
<VC:address-data>BEGIN:VCARD
|
||||
VERSION:3.0
|
||||
UID:pas-id-4BB0719600000000
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,11 +6,11 @@
|
||||
<prop>
|
||||
<getcontenttype>text/vcard</getcontenttype>
|
||||
<resourcetype/>
|
||||
<getcontentlength>1286</getcontentlength>
|
||||
<getcontentlength>1282</getcontentlength>
|
||||
<displayname>User 1</displayname>
|
||||
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
|
||||
<creationdate>yyyymmddThhmmssZ</creationdate>
|
||||
<getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
|
||||
<getetag>"a81fa8394d866e6037ea426554663e4c"</getetag>
|
||||
<getcontentlanguage/>
|
||||
<supportedlock>
|
||||
<lockentry>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
|
||||
<getetag>"a81fa8394d866e6037ea426554663e4c"</getetag>
|
||||
<VC:address-data>BEGIN:VCARD
|
||||
VERSION:3.0
|
||||
UID:pas-id-4BB0719600000000
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
<prop>
|
||||
<VC:address-data>BEGIN:VCARD
|
||||
VERSION:3.0
|
||||
REV:2010-03-29T09:23:34Z
|
||||
UID:pas-id-4BB0719600000000
|
||||
X-SKYPE;X-EVOLUTION-UI-SLOT=1;TYPE=HOME:karora__
|
||||
X-JABBER;X-EVOLUTION-UI-SLOT=3;TYPE=HOME:karora@irc.oftc.net
|
||||
@ -38,6 +37,7 @@ ROLE:Geek
|
||||
ORG:dotCal;;Porirua
|
||||
TITLE:Chief Technology Officer
|
||||
URL:http://andrew.mcmillan.net.nz/
|
||||
REV:20100329T092334Z
|
||||
END:VCARD
|
||||
</VC:address-data>
|
||||
</prop>
|
||||
|
||||
@ -8,9 +8,9 @@ Content-Type: text/plain; charset="utf-8"
|
||||
|
||||
count: >3<
|
||||
|
||||
fn: >Fred Weasley<
|
||||
|
||||
fn: >Donald Kelly<
|
||||
|
||||
fn: >Fred Weasley<
|
||||
|
||||
fn: >George Weasley<
|
||||
|
||||
|
||||
@ -48,6 +48,7 @@ QUERY
|
||||
SELECT fn
|
||||
FROM caldav_data JOIN addressbook_resource USING(dav_id)
|
||||
WHERE caldav_data.dav_name ~ '/user1/addresses/'
|
||||
ORDER BY fn
|
||||
ENDQUERY
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "1a0c2d97d0118e22caff1e90871e41dd"
|
||||
ETag: "58ff9a9120b534ef4911fc515c060cf6"
|
||||
Content-Length: 1206
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user2/.in/</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<displayname>User 2 Inbox</displayname>
|
||||
<resourcetype>
|
||||
<collection/>
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "f2de15142ea3906e3616b81150a746b5"
|
||||
ETag: "eb93d1fe1f470462e3fe504920ef6799"
|
||||
Content-Length: 4112
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -81,7 +81,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user2/.in/</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<displayname>User 2 Inbox</displayname>
|
||||
<resourcetype>
|
||||
<collection/>
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "b61898a70b17314ab1368136b7899458"
|
||||
ETag: "fb9405fd210ca3ecbff633bc2d47ebfd"
|
||||
Content-Length: 15604
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -298,7 +298,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user1/.in/</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<displayname>User 1 Inbox</displayname>
|
||||
<C1:supported-calendar-component-set>
|
||||
<C1:comp name="VEVENT"/>
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "093575e66024dd318bb5f22673014cbf"
|
||||
ETag: "990abcf1a53d5c9806ff29a600a0a8cb"
|
||||
Content-Length: 767
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user1/.in/</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<resourcetype>
|
||||
<collection/>
|
||||
<C1:schedule-inbox/>
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "d53571128cc728cde4c63151596715bf"
|
||||
ETag: "d87847918de54dee06d6412f855dbb1a"
|
||||
Content-Length: 18035
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -342,7 +342,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user1/.in/</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<displayname>User 1 Inbox</displayname>
|
||||
<C1:supported-calendar-component-set>
|
||||
<C1:comp name="VEVENT"/>
|
||||
|
||||
@ -4,7 +4,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "aec265205859386bcdf4b58ce5820905"
|
||||
ETag: "e76e5a37264c0b44f88f8456c27a7aaa"
|
||||
Content-Length: 27747
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -569,7 +569,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
</privilege>
|
||||
</current-user-privilege-set>
|
||||
<displayname>User 1 Inbox</displayname>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<owner>
|
||||
<href>/caldav.php/user1/</href>
|
||||
</owner>
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "ae6b5e0b9194d560b5b73b951f256b6e"
|
||||
ETag: "9f39c7aaec936d59b52abd670cd6039e"
|
||||
Content-Length: 12634
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -255,7 +255,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<propstat>
|
||||
<prop>
|
||||
<displayname>User 1 Inbox</displayname>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<C1:supported-calendar-component-set>
|
||||
<C1:comp name="VEVENT"/>
|
||||
<C1:comp name="VTODO"/>
|
||||
|
||||
@ -2,7 +2,7 @@ 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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "ae6b5e0b9194d560b5b73b951f256b6e"
|
||||
ETag: "9f39c7aaec936d59b52abd670cd6039e"
|
||||
Content-Length: 12634
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
@ -255,7 +255,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<propstat>
|
||||
<prop>
|
||||
<displayname>User 1 Inbox</displayname>
|
||||
<C:getctag>"435712d0457c874316eb9cdd41cf92bc"</C:getctag>
|
||||
<C:getctag>"a8dfd49637017ded49d3a8dbb315c51f"</C:getctag>
|
||||
<C1:supported-calendar-component-set>
|
||||
<C1:comp name="VEVENT"/>
|
||||
<C1:comp name="VTODO"/>
|
||||
|
||||
@ -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
|
||||
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
|
||||
ETag: "865f338c7ec05fb2917fb187a06b38a6"
|
||||
Content-Length: 1037
|
||||
ETag: "e7e83dc9ce42ab1d44defc985025bf9c"
|
||||
Content-Length: 1034
|
||||
Content-Type: text/xml; charset="utf-8"
|
||||
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
|
||||
<href>/caldav.php/user1/anotherone/86203AFD481A6C42892013E6E0C4845D039A2543AKEXBE02.telecom.tcnz.net.ics</href>
|
||||
<propstat>
|
||||
<prop>
|
||||
<getetag>"621885941033781f3462950c9bc2844b"</getetag>
|
||||
<getetag>"58c4e3803714261cd1184d939b0a0645"</getetag>
|
||||
<C:calendar-data>BEGIN:VCALENDAR
|
||||
PRODID:-//davical.org//NONSGML AWL Calendar//EN
|
||||
VERSION:2.0
|
||||
@ -22,8 +22,7 @@ UID:86203AFD481A6C42892013E6E0C4845D039A2543@AKEXBE02.telecom.tcnz.net
|
||||
DTSTAMP:20061005T230724Z
|
||||
DTSTART:20070120T093000
|
||||
SUMMARY:
|
||||
Reminder for Mark for Absolom Livasathan's PGP WF Services cost reques
|
||||
t
|
||||
Reminder for Mark for Absolom Livasathan's PGP WF Services cost request
|
||||
DESCRIPTION:
|
||||
From Absolom.Livasathan@example.com Fri Oct 6 12:00:02 2006\n
|
||||
ORGANIZER;CN=Absolom Livasathan:Absolom.Livasathan@example.com
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user