* component. This would be for webcal:// 'publish' operations, not
* for GroupDAV.
*/
-void groupdav_put_bigics(StrBuf *dav_content, int offset)
+void groupdav_put_bigics(void)
{
+ wcsession *WCC = WC;
char buf[1024];
/*
hprintf("HTTP/1.1 502 Bad Gateway\r\n");
groupdav_common_headers();
hprintf("Content-type: text/plain\r\n");
- wprintf("%s\r\n", &buf[4]);
+ begin_burst();
+ wc_printf("%s\r\n", &buf[4]);
end_burst();
return;
}
- serv_write(ChrPtr(dav_content) + offset, StrLength(dav_content) - offset);
+ serv_putbuf(WCC->upload);
serv_printf("\n000");
/* Report success and not much else. */
/*
* The pathname is always going to take one of two formats:
- * /groupdav/room_name/euid (GroupDAV)
- * /groupdav/room_name (webcal)
+ * [/groupdav/]room_name/euid (GroupDAV)
+ * [/groupdav/]room_name (webcal)
*/
-void groupdav_put(StrBuf *dav_pathname, char *dav_ifmatch,
- const char *dav_content_type, StrBuf *dav_content,
- int offset)
+void groupdav_put(void)
{
+ wcsession *WCC = WC;
StrBuf *dav_roomname;
StrBuf *dav_uid;
long new_msgnum = (-2L);
char buf[SIZ];
int n = 0;
- if (StrBufNum_tokens(dav_pathname, '/') < 3) {
+ if (StrBufNum_tokens(WCC->Hdr->HR.ReqLine, '/') < 2) {
hprintf("HTTP/1.1 404 not found\r\n");
groupdav_common_headers();
hprintf("Content-Type: text/plain\r\n");
- wprintf("The object you requested was not found.\r\n");
+ begin_burst();
+ wc_printf("The object you requested was not found.\r\n");
end_burst();
return;
}
dav_roomname = NewStrBuf();;
dav_uid = NewStrBuf();;
- StrBufExtract_token(dav_roomname, dav_pathname, 2, '/');
- StrBufExtract_token(dav_uid, dav_pathname, 3, '/');
+ StrBufExtract_token(dav_roomname, WCC->Hdr->HR.ReqLine, 0, '/');
+ StrBufExtract_token(dav_uid, WCC->Hdr->HR.ReqLine, 1, '/');
if ((!strcasecmp(ChrPtr(dav_uid), "ics")) ||
(!strcasecmp(ChrPtr(dav_uid), "calendar.ics"))) {
FlushStrBuf(dav_uid);
hprintf("HTTP/1.1 404 not found\r\n");
groupdav_common_headers();
hprintf("Content-Type: text/plain\r\n");
- wprintf("There is no folder called \"%s\" on this server.\r\n",
+ begin_burst();
+ wc_printf("There is no folder called \"%s\" on this server.\r\n",
ChrPtr(dav_roomname));
end_burst();
FreeStrBuf(&dav_roomname);
* client is expecting. If not, the server probably contains a newer
* version, so we fail...
*/
- if (!IsEmptyStr(dav_ifmatch)) {
- lprintf(9, "dav_ifmatch: %s\n", dav_ifmatch);
+ if (StrLength(WCC->Hdr->HR.dav_ifmatch) > 0) {
+ lprintf(9, "dav_ifmatch: %s\n", WCC->Hdr->HR.dav_ifmatch);
old_msgnum = locate_message_by_uid(ChrPtr(dav_uid));
lprintf(9, "old_msgnum: %ld\n", old_msgnum);
- if (atol(dav_ifmatch) != old_msgnum) {
+ if (StrTol(WCC->Hdr->HR.dav_ifmatch) != old_msgnum) {
hprintf("HTTP/1.1 412 Precondition Failed\r\n");
lprintf(9, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n",
- atol(dav_ifmatch), old_msgnum);
+ StrTol(WCC->Hdr->HR.dav_ifmatch), old_msgnum);
groupdav_common_headers();
- hprintf("Content-Length: 0\r\n");
+
end_burst();
FreeStrBuf(&dav_roomname);
FreeStrBuf(&dav_uid);
/** PUT on the collection itself uploads an ICS of the entire collection.
*/
if (StrLength(dav_uid) == 0) {
- groupdav_put_bigics(dav_content, offset);
+ groupdav_put_bigics();
FreeStrBuf(&dav_roomname);
FreeStrBuf(&dav_uid);
return;
hprintf("HTTP/1.1 502 Bad Gateway\r\n");
groupdav_common_headers();
hprintf("Content-type: text/plain\r\n");
-
- wprintf("%s\r\n", &buf[4]);
+ begin_burst();
+ wc_printf("%s\r\n", &buf[4]);
end_burst();
return;
}
/* Send the content to the Citadel server */
- serv_printf("Content-type: %s\n\n", dav_content_type);
- serv_puts(ChrPtr(dav_content) + offset);
+ //serv_printf("Content-type: %s\n\n", WCC->upload_content_type);
+ serv_putbuf(WCC->upload);
serv_puts("\n000");
/* Fetch the reply from the Citadel server */
hprintf("HTTP/1.1 502 Bad Gateway\r\n");
groupdav_common_headers();
hprintf("Content-type: text/plain\r\n");
- wprintf("new_msgnum is %ld\r\n"
+ begin_burst();
+ wc_printf("new_msgnum is %ld\r\n"
"\r\n", new_msgnum);
end_burst();
FreeStrBuf(&dav_roomname);
groupdav_common_headers();
hprintf("etag: \"%ld\"\r\n", new_msgnum);
hprintf("Location: ");
- groupdav_identify_host();
+ groupdav_identify_hosthdr();
hprintf("/groupdav/");/* TODO */
hurlescputs(ChrPtr(dav_roomname));
euid_escapize(escaped_uid, ChrPtr(dav_uid));