projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
555e716
)
Revert "Offer the 'calendar-access' option when an OPTIONS command is performed on...
author
Art Cancro
<ajc@uncensored.citadel.org>
Thu, 15 Dec 2011 21:59:35 +0000
(16:59 -0500)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Thu, 15 Dec 2011 21:59:35 +0000
(16:59 -0500)
This reverts commit
555e71676126d632725bf497b33e70fe63bb4599
.
webcit/dav_options.c
patch
|
blob
|
history
diff --git
a/webcit/dav_options.c
b/webcit/dav_options.c
index 11b7088d3f5756507b0d35c5f66520a462c886e8..b5f35abbc9b1281c31fd60a8bf6b8094b251c762 100644
(file)
--- a/
webcit/dav_options.c
+++ b/
webcit/dav_options.c
@@
-43,7
+43,7
@@
void dav_options(void)
StrBufExtract_token(dav_uid, WCC->Hdr->HR.ReqLine, 1, '/');
/*
StrBufExtract_token(dav_uid, WCC->Hdr->HR.ReqLine, 1, '/');
/*
- * If the room name is blank, the client is doing a
n OPTIONS on the root
.
+ * If the room name is blank, the client is doing a
top-level OPTIONS
.
*/
if (StrLength(dav_roomname) == 0) {
hprintf("HTTP/1.1 200 OK\r\n");
*/
if (StrLength(dav_roomname) == 0) {
hprintf("HTTP/1.1 200 OK\r\n");
@@
-85,6
+85,7
@@
void dav_options(void)
* a specific item in the room.
*/
if (StrLength(dav_uid) != 0) {
* a specific item in the room.
*/
if (StrLength(dav_uid) != 0) {
+
dav_msgnum = locate_message_by_uid(ChrPtr(dav_uid));
if (dav_msgnum < 0) {
hprintf("HTTP/1.1 404 not found\r\n");
dav_msgnum = locate_message_by_uid(ChrPtr(dav_uid));
if (dav_msgnum < 0) {
hprintf("HTTP/1.1 404 not found\r\n");
@@
-124,17
+125,7
@@
void dav_options(void)
hprintf("HTTP/1.1 200 OK\r\n");
dav_common_headers();
hprintf("Date: %s\r\n", datestring);
hprintf("HTTP/1.1 200 OK\r\n");
dav_common_headers();
hprintf("Date: %s\r\n", datestring);
-
- /*
- * Offer CalDAV (RFC 4791) if this is a calendar room
- */
- if ( (WC->CurRoom.view == VIEW_CALENDAR) || (WC->CurRoom.view == VIEW_CALBRIEF) ) {
- hprintf("DAV: 1, calendar-access\r\n");
- }
- else {
- hprintf("DAV: 1\r\n");
- }
-
+ hprintf("DAV: 1\r\n");
hprintf("Allow: OPTIONS, PROPFIND, GET, PUT\r\n");
begin_burst();
wc_printf("\r\n");
hprintf("Allow: OPTIONS, PROPFIND, GET, PUT\r\n");
begin_burst();
wc_printf("\r\n");