* Added some HTTP Date: header output

[citadel.git] / webcit / groupdav_propfind.c

diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c
index d0f3f7f65bd6dcffd65c8a177ad084fd51f09cb9..c349086542008989d1862de6a19350e2a7495372 100644 (file)
--- a/webcit/groupdav_propfind.c
+++ b/webcit/groupdav_propfind.c
@@ -62,6 +62,11 @@ void groupdav_folder_list(void) {
        char buf[SIZ];
        char roomname[SIZ];
        int view;
+       char datestring[SIZ];
+       time_t now;
+
+       now = time(NULL);
+       http_datestring(datestring, sizeof datestring, now);
 
        /*
         * Be rude.  Completely ignore the XML request and simply send them
@@ -69,12 +74,14 @@ void groupdav_folder_list(void) {
         */
        wprintf("HTTP/1.0 207 Multi-Status\r\n");
        groupdav_common_headers();
+       wprintf("Date: %s\r\n", datestring);
        wprintf("Content-type: text/xml\r\n");
+       wprintf("Content-encoding: identity\r\n");
 
        begin_burst();
 
-       wprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n"
-               "<D:multistatus xmlns:D=\"DAV:\">\r\n"
+       wprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+               "<D:multistatus xmlns:D=\"DAV:\">\n"
        );
 
        serv_puts("LKRA");
@@ -91,7 +98,7 @@ void groupdav_folder_list(void) {
                 */
                if ((view == VIEW_CALENDAR) || (view == VIEW_TASKS) || (view == VIEW_ADDRESSBOOK) ) {
 
-                       wprintf(" <D:response>\r\n");
+                       wprintf(" <D:response>\n");
 
                        wprintf("  <D:href>");
                        if (strlen(WC->http_host) > 0) {
@@ -101,35 +108,35 @@ void groupdav_folder_list(void) {
                        }
                        wprintf("/groupdav/");
                        urlescputs(roomname);
-                       wprintf("/</D:href>\r\n");
+                       wprintf("/</D:href>\n");
 
-                       wprintf("  <D:propstat>\r\n");
-                       wprintf("   <D:status>HTTP/1.1 200 OK</D:status>\r\n");
-                       wprintf("   <D:prop>\r\n");
+                       wprintf("  <D:propstat>\n");
+                       wprintf("   <D:status>HTTP/1.1 200 OK</D:status>\n");
+                       wprintf("   <D:prop>\n");
                        wprintf("    <D:displayname>");
                        escputs(                roomname);
-                       wprintf(                        "</D:displayname>\r\n");
+                       wprintf(                        "</D:displayname>\n");
                        wprintf("    <D:resourcetype><D:collection/>");
 
                        switch(view) {
                                case VIEW_CALENDAR:
-                                       wprintf("        <G:vevent-collection />\r\n");
+                                       wprintf("        <G:vevent-collection />\n");
                                        break;
                                case VIEW_TASKS:
-                                       wprintf("        <G:vtodo-collection />\r\n");
+                                       wprintf("        <G:vtodo-collection />\n");
                                        break;
                                case VIEW_ADDRESSBOOK:
-                                       wprintf("        <G:vcard-collection />\r\n");
+                                       wprintf("        <G:vcard-collection />\n");
                                        break;
                        }
 
-                       wprintf(                                "</D:resourcetype>\r\n");
-                       wprintf("   </D:prop>\r\n");
-                       wprintf("  </D:propstat>\r\n");
-                       wprintf(" </D:response>\r\n");
+                       wprintf(                                "</D:resourcetype>\n");
+                       wprintf("   </D:prop>\n");
+                       wprintf("  </D:propstat>\n");
+                       wprintf(" </D:response>\n");
                }
        }
-       wprintf("</D:multistatus>\r\n\r\n\r\n");
+       wprintf("</D:multistatus>\n\n\n");
 
        end_burst();
 }
@@ -148,6 +155,12 @@ void groupdav_propfind(char *dav_pathname) {
        long *msgs = NULL;
        int num_msgs = 0;
        int i;
+       char datestring[SIZ];
+       time_t now;
+
+       now = time(NULL);
+       http_datestring(datestring, sizeof datestring, now);
+
 
        /* First, break off the "/groupdav/" prefix */
        remove_token(dav_pathname, 0, '/');
@@ -176,6 +189,7 @@ void groupdav_propfind(char *dav_pathname) {
        if (strcasecmp(WC->wc_roomname, dav_roomname)) {
                wprintf("HTTP/1.1 404 not found\r\n");
                groupdav_common_headers();
+               wprintf("Date: %s\r\n", datestring);
                wprintf(
                        "Content-Type: text/plain\r\n"
                        "\r\n"
@@ -192,12 +206,14 @@ void groupdav_propfind(char *dav_pathname) {
         */
        wprintf("HTTP/1.0 207 Multi-Status\r\n");
        groupdav_common_headers();
+       wprintf("Date: %s\r\n", datestring);
        wprintf("Content-type: text/xml\r\n");
+       wprintf("Content-encoding: identity\r\n");
 
        begin_burst();
 
-       wprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n"
-               "<D:multistatus xmlns:D=\"DAV:\">\r\n"
+       wprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+               "<D:multistatus xmlns:D=\"DAV:\">\n"
        );
 
        serv_puts("MSGS ALL");
@@ -219,7 +235,7 @@ void groupdav_propfind(char *dav_pathname) {
                }
 
                if (strlen(uid) > 0) {
-                       wprintf(" <D:response>\r\n");
+                       wprintf(" <D:response>\n");
                        wprintf("  <D:href>");
                        if (strlen(WC->http_host) > 0) {
                                wprintf("%s://%s",
@@ -230,16 +246,16 @@ void groupdav_propfind(char *dav_pathname) {
                        urlescputs(WC->wc_roomname);
                        euid_escapize(encoded_uid, uid);
                        wprintf("/%s", encoded_uid);
-                       wprintf("</D:href>\r\n");
-                       wprintf("   <D:propstat>\r\n");
-                       wprintf("    <D:status>HTTP/1.1 200 OK</D:status>\r\n");
-                       wprintf("    <D:prop><D:getetag>\"%ld\"</D:getetag></D:prop>\r\n", msgs[i]);
-                       wprintf("   </D:propstat>\r\n");
-                       wprintf(" </D:response>\r\n");
+                       wprintf("</D:href>\n");
+                       wprintf("   <D:propstat>\n");
+                       wprintf("    <D:status>HTTP/1.1 200 OK</D:status>\n");
+                       wprintf("    <D:prop><D:getetag>\"%ld\"</D:getetag></D:prop>\n", msgs[i]);
+                       wprintf("   </D:propstat>\n");
+                       wprintf(" </D:response>\n");
                }
        }
 
-       wprintf("</D:multistatus>\r\n\r\n\r\n");
+       wprintf("</D:multistatus>\n\n\n");
        end_burst();
 
        if (msgs != NULL) {