* GroupDAV now outputs <href> tags containing server-absolute URL's instead

  of globally absolute URL's.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 0233735b7faecd8a8da7eee70324b17190dec9e0..d6139869abb9508705205f5b94c44fd9790fb5e1 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,9 @@
 $Id$
 
+Mon Jan 30 15:25:43 EST 2006 ajc
+* GroupDAV now outputs <href> tags containing server-absolute URL's instead
+  of globally absolute URL's.
+
 Mon Jan 30 12:09:00 EST 2006 ajc
 * When the -f option is specified, honor X-Forwarded-Host: in addition
   to X-Forwarded-For: headers.  This helps GroupDAV along.

diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c
index dd3fd74688bcc0ea3413d93a397ba9dcbb44c2f5..c32fc6a5f7f344dc3b22aae857d0224401e249c7 100644 (file)
--- a/webcit/groupdav_main.c
+++ b/webcit/groupdav_main.c
@@ -126,16 +126,6 @@ void groupdav_main(struct httprequest *req,
        strcpy(dav_ifmatch, "");
 
        for (rptr=req; rptr!=NULL; rptr=rptr->next) {
-               /* lprintf(9, "< %s\n", rptr->line); */
-
-               /*
-                * We don't appear to need this; it was already done in webcit.c
-               if (!strncasecmp(rptr->line, "Host: ", 6)) {
-                        safestrncpy(WC->http_host, &rptr->line[6],
-                               sizeof WC->http_host);
-                }
-               */
-
                if (!strncasecmp(rptr->line, "If-Match: ", 10)) {
                         safestrncpy(dav_ifmatch, &rptr->line[10],
                                sizeof dav_ifmatch);

diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c
index 615251f086b24dee942fd6969488aad490bfe9c3..16dad8794979fb94e412e1c8494b32e579404ed9 100644 (file)
--- a/webcit/groupdav_propfind.c
+++ b/webcit/groupdav_propfind.c
@@ -97,11 +97,13 @@ void groupdav_folder_list(void) {
                        wprintf("<D:response>");
 
                        wprintf("<D:href>");
+/*
                        if (strlen(WC->http_host) > 0) {
                                wprintf("%s://%s",
                                        (is_https ? "https" : "http"),
                                        WC->http_host);
                        }
+ */
                        wprintf("/groupdav/");
                        urlescputs(roomname);
                        wprintf("/</D:href>");
@@ -237,11 +239,13 @@ void groupdav_propfind(char *dav_pathname) {
                wprintf("<D:response>");
 
                wprintf("<D:href>");
+/*
                if (strlen(WC->http_host) > 0) {
                        wprintf("%s://%s",
                                (is_https ? "https" : "http"),
                                WC->http_host);
                }
+ */
                wprintf("/groupdav/");
                urlescputs(WC->wc_roomname);
                euid_escapize(encoded_uid, dav_uid);
@@ -300,11 +304,13 @@ void groupdav_propfind(char *dav_pathname) {
                if (strlen(uid) > 0) {
                        wprintf("<D:response>");
                        wprintf("<D:href>");
+/*
                        if (strlen(WC->http_host) > 0) {
                                wprintf("%s://%s",
                                        (is_https ? "https" : "http"),
                                        WC->http_host);
                        }
+ */
                        wprintf("/groupdav/");
                        urlescputs(WC->wc_roomname);
                        euid_escapize(encoded_uid, uid);

diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c
index d06848ec23ec503f6501b1befa158d84af49966c..e3d83a6370f0e0e867c984bac26cd38cabe5d374 100644 (file)
--- a/webcit/groupdav_put.c
+++ b/webcit/groupdav_put.c
@@ -139,11 +139,13 @@ void groupdav_put(char *dav_pathname, char *dav_ifmatch,
                wprintf("etag: \"%ld\"\r\n", new_msgnum);
                wprintf("Content-Length: 0\r\n");
                wprintf("Location: ");
+/*
                if (strlen(WC->http_host) > 0) {
                        wprintf("%s://%s",
                                (is_https ? "https" : "http"),
                                WC->http_host);
                }
+ */
                wprintf("/groupdav/");
                urlescputs(dav_roomname);
                wprintf("/%s\r\n", dav_uid);