From ad1d0d3525add6a139e41308b2931ae70b0c9b57 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@uncensored.citadel.org>
Date: Mon, 14 Nov 2011 16:25:41 -0500
Subject: [PATCH] closing in on the dav problem ... not quite there yet

---
 webcit/context_loop.c | 21 +++++++++++++++------
 webcit/webcit.c       |  7 ++++---
 webcit/webcit.h       |  2 --
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index f3d54c4ce..0ed08dc10 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -178,31 +178,40 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
 				continue;
 			if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
 			    (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) {
+				syslog(LOG_DEBUG, "-- matched a session with the same http-auth");
 				TheSession = sptr;
 			}
 			if (TheSession == NULL)
-				syslog(1, "found sessionkey [%d], but credentials for [%s|%s] didn't match\n",
-					Hdr->HR.SessionKey,ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username));
+				syslog(1, "found sessionkey [%d], but credentials for [%s|%s] didn't match",
+					Hdr->HR.SessionKey,
+					ChrPtr(Hdr->c_username),
+					ChrPtr(sptr->wc_username)
+				);
 			break;
 		case AUTH_COOKIE:
 			/* If cookie-session, look for a session with matching session ID */
 			if ( (Hdr->HR.desired_session != 0) && 
-			     (sptr->wc_session == Hdr->HR.desired_session)) {
+			     (sptr->wc_session == Hdr->HR.desired_session))
+			{
+				syslog(LOG_DEBUG, "-- matched a session with the same cookie");
 				TheSession = sptr;
 			}
 			break;			     
 		case NO_AUTH:
 			/* Any unbound session is a candidate */
 			if ( (sptr->wc_session == 0) && (sptr->inuse == 0) ) {
+				syslog(LOG_DEBUG, "-- reusing an unbound session");
 				TheSession = sptr;
 			}
 			break;
 		}
 	}
 	CtdlLogResult(pthread_mutex_unlock(ListMutex));
-	if (TheSession == NULL)
-		syslog(1, "didn't find sessionkey [%d] for user [%s]\n",
-			Hdr->HR.SessionKey, ChrPtr(Hdr->c_username));
+	if (TheSession == NULL) {
+		syslog(1, "didn't find sessionkey [%d] for user [%s]",
+			Hdr->HR.SessionKey, ChrPtr(Hdr->c_username)
+		);
+	}
 	return TheSession;
 }
 
diff --git a/webcit/webcit.c b/webcit/webcit.c
index aa8c4cfbd..d988ea8b9 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -584,7 +584,7 @@ int ReadPostData(void)
 	return 1;
 }
 
-
+#if 0
 void ParseREST_URL(void)
 {
 	StrBuf *Buf;
@@ -626,6 +626,7 @@ void ParseREST_URL(void)
 		}
 	}
 }
+#endif
 
 int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -812,10 +813,10 @@ void session_loop(void)
 			display_login();
 		}
 		else {
-/*
+#if 0
 			if ((WCC->Hdr->HR.Handler->Flags & PARSE_REST_URL) != 0)
 				ParseREST_URL();
-*/
+#endif
 			if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
 				begin_ajax_response();
 			WCC->Hdr->HR.Handler->F();
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 0beda739a..3951ea388 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -511,9 +511,7 @@ struct wcsession {
 	StrBuf *WBuf;                           /* Our output buffer */
 	StrBuf *HBuf;                           /* Our HeaderBuffer */
 	StrBuf *WFBuf;                          /* Wildfire error logging buffer */
-
 	StrBuf *trailing_javascript;		/* extra javascript to be appended to page */
-/*	char ImportantMessage[SIZ];*/
 	StrBuf *ImportantMsg;
 	HashList *Directory;			/* Parts of the directory URL in snippets */
 	const Floor *CurrentFloor;              /* when Parsing REST, which floor are we on? */
-- 
2.30.2