return TheSession;
}
-wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
+wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
{
wcsession *TheSession;
- lprintf(3, "Creating a new session\n");
+ if (!Static)
+ lprintf(3, "Creating a new session\n");
TheSession = (wcsession *) malloc(sizeof(wcsession));
memset(TheSession, 0, sizeof(wcsession));
TheSession->Hdr = Hdr;
TheSession->SessionKey = Hdr->HR.SessionKey;
TheSession->serv_sock = (-1);
- TheSession->chat_sock = (-1);
TheSession->is_mobile = -1;
pthread_setspecific(MyConKey, (void *)TheSession);
else {
TheSession->wc_session = Hdr->HR.desired_session;
}
-
+ Hdr->HR.Static = Static;
session_new_modules(TheSession);
if (Lockable) {
{
hprintf("HTTP/1.1 404 Not found\r\n");
hprintf("Content-Type: text/plain\r\n");
- wprintf("Not found\r\n");
+ wc_printf("Not found\r\n");
end_burst();
}
StrBufExtract_token(HeaderName, Line, 0, ':');
pchs = ChrPtr(Line);
+ pche = pchs + StrLength(Line);
pch = pchs + StrLength(HeaderName) + 1;
pche = pchs + StrLength(Line);
- while (isspace(*pch) && (pch < pche))
+ while ((pch < pche) && isspace(*pch))
pch ++;
StrBufCutLeft(Line, pch - pchs);
{
StrBuf *Buf = NewStrBuf();
- FlushStrBuf(Hdr->HR.ReqLine);
- StrBufPlain(Hdr->HR.ReqLine, Line, len);
+ if (Hdr->HR.ReqLine != NULL) {
+ FlushStrBuf(Hdr->HR.ReqLine);
+ StrBufPlain(Hdr->HR.ReqLine, Line, len);
+ }
+ else {
+ Hdr->HR.ReqLine = NewStrBufPlain(Line, len);
+ }
ReadHttpSubject(Hdr, Hdr->HR.ReqLine, Buf);
FreeStrBuf(&Buf);
{
wcsession *Bogus;
- Bogus = CreateSession(0, NULL, Hdr, NULL);
+ Bogus = CreateSession(0, 1, NULL, Hdr, NULL);
do_404();
if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
{
wcsession *Static;
- Static = CreateSession(0, NULL, Hdr, NULL);
+ Static = CreateSession(0, 1, NULL, Hdr, NULL);
Hdr->HR.Handler->F();
* Create a new session if we have to
*/
if (TheSession == NULL) {
- TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
+ TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex);
if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) {
StrBufAppendTemplate(Target, TP, WC->wc_fullname, 0);
}
-void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
-{
- StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0);
-}
-
void Header_HandleContentLength(StrBuf *Line, ParsedHttpHdrs *hdr)
{
hdr->HR.ContentLength = StrToi(Line);
RegisterHeaderHandler(HKEY("IF-MODIFIED-SINCE"), Header_HandleIfModSince);
RegisterNamespace("CURRENT_USER", 0, 1, tmplput_current_user, NULL, CTX_NONE);
- RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
RegisterNamespace("NONCE", 0, 0, tmplput_nonce, NULL, 0);
WebcitAddUrlHandler(HKEY("404"), "", 0, do_404, ANONYMOUS|COOKIEUNNEEDED);