/*
- * $Id$
- *
* This is the other half of the webserver. It handles the task of hooking
* up HTTP requests with the sessions they belong to, using HTTP cookies to
* keep track of things. If the HTTP request doesn't belong to any currently
* active session, a new session is started.
*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2011 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
* Lock the session list, moving any candidates for euthanasia into
* a separate list.
*/
- pthread_mutex_lock(&SessionListMutex);
+ CtdlLogResult(pthread_mutex_lock(&SessionListMutex));
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
/* Kill idle sessions */
sessions_to_kill = sptr;
}
}
- pthread_mutex_unlock(&SessionListMutex);
+ CtdlLogResult(pthread_mutex_unlock(&SessionListMutex));
/*
* Now free up and destroy the culled sessions.
session_destroy_modules(&sessions_to_kill);
sessions_to_kill = sptr;
}
+}
- /*
- * Check the size of our thread pool. If all threads are executing, spawn another.
- */
- begin_critical_section(S_SPAWNER);
- while (
+/*
+ * Check the size of our thread pool. If all threads are executing, spawn another.
+ */
+void check_thread_pool_size(void)
+{
+ if (time_to_die) return; /* don't expand the thread pool during shutdown */
+
+ begin_critical_section(S_SPAWNER); /* only one of these should run at a time */
+ if (
(num_threads_executing >= num_threads_existing)
&& (num_threads_existing < MAX_WORKER_THREADS)
) {
+ lprintf(3, "%d of %d threads are executing. Adding another worker thread.\n",
+ num_threads_executing,
+ num_threads_existing
+ );
spawn_another_worker_thread();
}
end_critical_section(S_SPAWNER);
GetAuthBasic(Hdr);
}
- pthread_mutex_lock(ListMutex);
+ CtdlLogResult(pthread_mutex_lock(ListMutex));
for (sptr = *wclist; ((sptr != NULL) && (TheSession == NULL)); sptr = sptr->next) {
/* If HTTP-AUTH, look for a session with matching credentials */
break;
}
}
- pthread_mutex_unlock(ListMutex);
+ CtdlLogResult(pthread_mutex_unlock(ListMutex));
if (TheSession == NULL)
lprintf(1, "didn't find sessionkey [%ld] for user [%s]\n",
Hdr->HR.SessionKey,ChrPtr(Hdr->c_username));
TheSession->Hdr = Hdr;
TheSession->SessionKey = Hdr->HR.SessionKey;
TheSession->serv_sock = (-1);
- TheSession->is_mobile = -1;
pthread_setspecific(MyConKey, (void *)TheSession);
pthread_mutex_init(&TheSession->SessionMutex, NULL);
if (ListMutex != NULL)
- pthread_mutex_lock(ListMutex);
+ CtdlLogResult(pthread_mutex_lock(ListMutex));
if (wclist != NULL) {
TheSession->nonce = rand();
*wclist = TheSession;
}
if (ListMutex != NULL)
- pthread_mutex_unlock(ListMutex);
+ CtdlLogResult(pthread_mutex_unlock(ListMutex));
}
return TheSession;
}
-/*
- * Detects a 'mobile' user agent
- */
-int is_mobile_ua(char *user_agent) {
- if (strstr(user_agent,"iPhone OS") != NULL) {
- return 1;
- } else if (strstr(user_agent,"Windows CE") != NULL) {
- return 1;
- } else if (strstr(user_agent,"SymbianOS") != NULL) {
- return 1;
- } else if (strstr(user_agent, "Opera Mobi") != NULL) {
- return 1;
- } else if (strstr(user_agent, "Firefox/2.0.0 Opera 9.51 Beta") != NULL) {
- /* For some reason a new install of Opera 9.51beta decided to spoof. */
- return 1;
- }
- return 0;
-}
-
/* If it's a "force 404" situation then display the error and bail. */
void do_404(void)
{
}
StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0);
+
/* chop Filename / query arguments */
Args = strchr(ChrPtr(Hdr->HR.ReqLine), '?');
if (Args == NULL) /* whe're not that picky about params... TODO: this will spoil '&' in filenames.*/
if (TheSession == NULL) {
TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex);
- if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) {
-
- if ((Hdr->HR.Handler != NULL) &&
- (XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) {
- OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0"));
- Hdr->HR.prohibit_caching = 1;
- }
- else {
- OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0"));
- Hdr->HR.prohibit_caching = 1;
- }
+ if ( (StrLength(Hdr->c_username) == 0)
+ && (!Hdr->HR.DontNeedAuth)
+ && (Hdr->HR.Handler != NULL)
+ && ((XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS)
+ ) {
+ OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0"));
+ Hdr->HR.prohibit_caching = 1;
}
if (StrLength(Hdr->c_language) > 0) {
/*
* Bind to the session and perform the transaction
*/
- pthread_mutex_lock(&TheSession->SessionMutex); /* bind */
+ CtdlLogResult(pthread_mutex_lock(&TheSession->SessionMutex));
pthread_setspecific(MyConKey, (void *)TheSession);
TheSession->lastreq = time(NULL); /* log */
session_detach_modules(TheSession);
TheSession->Hdr = NULL;
- pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
+ CtdlLogResult(pthread_mutex_unlock(&TheSession->SessionMutex));
}
void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
hdr->HR.ContentType = Line;
}
-void Header_HandleUserAgent(StrBuf *Line, ParsedHttpHdrs *hdr)
-{
- hdr->HR.user_agent = Line;
-#ifdef TECH_PREVIEW
-/* TODO: do this later on session creating
- if ((WCC->is_mobile < 0) && is_mobile_ua(&buf[12])) {
- WCC->is_mobile = 1;
- }
- else {
- WCC->is_mobile = 0;
- }
-*/
-#endif
-}
-
void Header_HandleHost(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- if ((follow_xff) && (hdr->HR.http_host != NULL))
- return;
- else
- hdr->HR.http_host = Line;
+ if (site_prefix == NULL) {
+ site_prefix = NewStrBuf();
+ StrBufAppendPrintf(site_prefix, "%s://", (is_https ? "https" : "http") );
+ StrBufAppendBuf(site_prefix, Line, 0);
+ }
}
void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- if (follow_xff)
- hdr->HR.http_host = Line;
+ if ( (follow_xff) && (site_prefix == NULL)) {
+ site_prefix = NewStrBuf();
+ StrBufAppendPrintf(site_prefix, "http://"); /* this is naive; do something about it */
+ StrBufAppendBuf(site_prefix, Line, 0);
+ }
}
{
RegisterHeaderHandler(HKEY("CONTENT-LENGTH"), Header_HandleContentLength);
RegisterHeaderHandler(HKEY("CONTENT-TYPE"), Header_HandleContentType);
- RegisterHeaderHandler(HKEY("USER-AGENT"), Header_HandleUserAgent);
RegisterHeaderHandler(HKEY("X-FORWARDED-HOST"), Header_HandleXFFHost); /* Apache way... */
RegisterHeaderHandler(HKEY("X-REAL-IP"), Header_HandleXFFHost); /* NGinX way... */
RegisterHeaderHandler(HKEY("HOST"), Header_HandleHost);
projects / citadel.git / blobdiff