Make etag consistent between runs.

This commit is contained in:
Andrew McMillan 2009-06-15 08:19:30 +12:00
parent 5693e3698b
commit f61ae556e5
9 changed files with 36 additions and 30 deletions

View File

@ -41,11 +41,13 @@ INSERT INTO role_member (user_no, role_no) VALUES( 300, 2);
SELECT setval('usr_user_no_seq', 1000);
UPDATE usr SET joined = '2009-06-01', updated = '2009-06-02';
INSERT INTO collection (user_no, parent_container, dav_name, dav_etag,
dav_displayname, is_calendar, created, modified,
public_events_only, publicly_readable, collection_id)
SELECT user_no, '/' || username || '/', '/' || username || '/home/', md5(username),
username || ' home', TRUE, current_timestamp, current_timestamp,
username || ' home', TRUE, '2009-06-03', '2009-06-04',
FALSE, FALSE, user_no FROM usr;
SELECT setval('dav_id_seq', 1000);

View File

@ -1,7 +1,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
ETag: "ead6125b6dea57939a8570868e2993db"
ETag: "d572340caf57bae1197d72a287654356"
Content-Length: 3560
Content-Type: text/xml; charset="utf-8"
@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user2/</href>
<propstat>
<prop>
<A:getctag>"11a496e279532f7704e78273d9f4cb72"</A:getctag>
<A:getctag>"f3a754d098fc688900631c6293d40fa5"</A:getctag>
<displayname>User 2</displayname>
<resourcetype>
<principal/>

View File

@ -1,7 +1,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
ETag: "abdb73b0ef74364a7c0a761e83521940"
ETag: "0b389661ad23c1fac7a9bb91b9fbc49a"
Content-Length: 3553
Content-Type: text/xml; charset="utf-8"
@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/manager1/</href>
<propstat>
<prop>
<A:getctag>"cc0d9a04234ddc58af945d7ee545cb53"</A:getctag>
<A:getctag>"ab4a67c917e242e0989cd278c75a510e"</A:getctag>
<displayname>Manager 1</displayname>
<resourcetype>
<principal/>

View File

@ -64,7 +64,7 @@
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"fd84dc1213cd7327814b2678818256b9"</getetag>
<getetag>"89514106d00f37cc9ee71689c450d2ef"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -111,7 +111,7 @@
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"cc0d9a04234ddc58af945d7ee545cb53"</getetag>
<getetag>"ab4a67c917e242e0989cd278c75a510e"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -158,7 +158,7 @@
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"1f45fac9bb5e3c2c46bba2710f3276d0"</getetag>
<getetag>"4d470212545b8dd76f702fe2444accad"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -205,7 +205,7 @@
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"558111d50505d0a41581131a5d59ce3d"</getetag>
<getetag>"c8ebc60237eb353a52e7278c96e50a74"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -252,7 +252,7 @@
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"422bce507895a5f03e576b6e56e10619"</getetag>
<getetag>"22a1e83f9f1b185fee3c792c15015af0"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>

View File

@ -1,8 +1,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
ETag: "5869946084923881996632ea03438a2c"
Content-Length: 947
ETag: "1eec1599c7beefc169bc00e1834dafa3"
Content-Length: 971
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -19,7 +19,9 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<principal-URL>/caldav.php/user1/</principal-URL>
<principal-URL>
<href>/caldav.php/user1/</href>
</principal-URL>
<alternate-URI-set/>
<group-member-set/>
<group-membership>

View File

@ -1,8 +1,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
ETag: "29f0412d2c402fb6edac110ea02142d2"
Content-Length: 899
ETag: "d047d6bb34fe6e227afcb6ca4336883b"
Content-Length: 923
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -19,7 +19,9 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<principal-URL>/caldav.php/resmgr1/</principal-URL>
<principal-URL>
<href>/caldav.php/resmgr1/</href>
</principal-URL>
<alternate-URI-set/>
<group-member-set>
<href>/caldav.php/user1/</href>

View File

@ -18,7 +18,7 @@
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"fd84dc1213cd7327814b2678818256b9"</getetag>
<getetag>"89514106d00f37cc9ee71689c450d2ef"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>

View File

@ -1,7 +1,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
ETag: "1a35cf38096e9dbb860079f5b965e772"
ETag: "ab183d93ccc90f7e2e0da7446e69e378"
Content-Length: 5275
Content-Type: text/xml; charset="utf-8"
@ -52,14 +52,14 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"fd84dc1213cd7327814b2678818256b9"</getetag>
<getetag>"89514106d00f37cc9ee71689c450d2ef"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"fd84dc1213cd7327814b2678818256b9"</A:getctag>
<A:getctag>"89514106d00f37cc9ee71689c450d2ef"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
@ -83,14 +83,14 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"cc0d9a04234ddc58af945d7ee545cb53"</getetag>
<getetag>"ab4a67c917e242e0989cd278c75a510e"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"cc0d9a04234ddc58af945d7ee545cb53"</A:getctag>
<A:getctag>"ab4a67c917e242e0989cd278c75a510e"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
@ -114,14 +114,14 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"1f45fac9bb5e3c2c46bba2710f3276d0"</getetag>
<getetag>"4d470212545b8dd76f702fe2444accad"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"1f45fac9bb5e3c2c46bba2710f3276d0"</A:getctag>
<A:getctag>"4d470212545b8dd76f702fe2444accad"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
@ -145,14 +145,14 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"558111d50505d0a41581131a5d59ce3d"</getetag>
<getetag>"c8ebc60237eb353a52e7278c96e50a74"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"558111d50505d0a41581131a5d59ce3d"</A:getctag>
<A:getctag>"c8ebc60237eb353a52e7278c96e50a74"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
@ -176,14 +176,14 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"422bce507895a5f03e576b6e56e10619"</getetag>
<getetag>"22a1e83f9f1b185fee3c792c15015af0"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"422bce507895a5f03e576b6e56e10619"</A:getctag>
<A:getctag>"22a1e83f9f1b185fee3c792c15015af0"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

View File

@ -1,7 +1,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
ETag: "084b04273eb22d6346e371df5ea2a781"
ETag: "9e78ea005d3f6d76f51990c052218f91"
Content-Length: 3128
Content-Type: text/xml; charset="utf-8"
@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/User%20Six/</href>
<propstat>
<prop>
<A:getctag>"8d5fd547760285244a4223cf5728fe42"</A:getctag>
<A:getctag>"f077f746d340bc4f1998b35342411363"</A:getctag>
<displayname>User 6</displayname>
<resourcetype>
<principal/>