* waiting on the specified port for incoming HTTP connections. When a
* connection is established, it calls context_loop() from context_loop.c.
*
- * Copyright (c) 1996-2008 by the citadel.org developers.
+ * Copyright (c) 1996-2009 by the citadel.org developers.
* This program is released under the terms of the GNU General Public License v3.
*
*/
int follow_xff = 0; /* Follow X-Forwarded-For: header */
int home_specified = 0; /* did the user specify a homedir? */
int time_to_die = 0; /* Nonzero if server is shutting down */
-extern void *context_loop(int*);
+int DisableGzip = 0;
+extern void *context_loop(ParsedHttpHdrs *Hdr);
extern void *housekeeping_loop(void);
extern pthread_mutex_t SessionListMutex;
extern pthread_key_t MyConKey;
+extern int ig_tcp_server(char *ip_addr, int port_number, int queue_len);
+extern int ig_uds_server(char *sockpath, int queue_len);
+
char ctdl_key_dir[PATH_MAX]=SSL_DIR;
char file_crpt_file_key[PATH_MAX]="";
char file_crpt_file_cer[PATH_MAX]="";
char socket_dir[PATH_MAX]; /* where to talk to our citadel server */
-static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /* nailed to what configure gives us. */
-static char static_dir[PATH_MAX]; /* calculated on startup */
-static char static_local_dir[PATH_MAX]; /* calculated on startup */
-static char static_icon_dir[PATH_MAX]; /* where should we find our mime icons? */
+const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /* nailed to what configure gives us. */
+char static_dir[PATH_MAX]; /* calculated on startup */
+char static_local_dir[PATH_MAX]; /* calculated on startup */
+char static_icon_dir[PATH_MAX]; /* where should we find our mime icons? */
char *static_dirs[]={ /* needs same sort order as the web mapping */
(char*)static_dir, /* our templates on disk */
(char*)static_local_dir, /* user provided templates disk */
int running_as_daemon = 0; /* should we deamonize on startup? */
-/*
- * This is a generic function to set up a master socket for listening on
- * a TCP port. The server shuts down if the bind fails.
- *
- * ip_addr IP address to bind
- * port_number port number to bind
- * queue_len number of incoming connections to allow in the queue
- */
-int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
-{
- struct sockaddr_in sin;
- int s, i;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- if (ip_addr == NULL) {
- sin.sin_addr.s_addr = INADDR_ANY;
- } else {
- sin.sin_addr.s_addr = inet_addr(ip_addr);
- }
-
- if (sin.sin_addr.s_addr == INADDR_NONE) {
- sin.sin_addr.s_addr = INADDR_ANY;
- }
-
- if (port_number == 0) {
- lprintf(1, "Cannot start: no port number specified.\n");
- exit(WC_EXIT_BIND);
- }
- sin.sin_port = htons((u_short) port_number);
-
- s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
- if (s < 0) {
- lprintf(1, "Can't create a socket: %s\n", strerror(errno));
- exit(WC_EXIT_BIND);
- }
- /* Set some socket options that make sense. */
- i = 1;
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
-
- fcntl(s, F_SETFL, O_NONBLOCK); /* maide: this statement is incorrect
- there should be a preceding F_GETFL
- and a bitwise OR with the previous
- fd flags */
-
- if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
- lprintf(1, "Can't bind: %s\n", strerror(errno));
- exit(WC_EXIT_BIND);
- }
- if (listen(s, queue_len) < 0) {
- lprintf(1, "Can't listen: %s\n", strerror(errno));
- exit(WC_EXIT_BIND);
- }
- return (s);
-}
-
-
-
-/*
- * Create a Unix domain socket and listen on it
- * sockpath - file name of the unix domain socket
- * queue_len - Number of incoming connections to allow in the queue
- */
-int ig_uds_server(char *sockpath, int queue_len)
-{
- struct sockaddr_un addr;
- int s;
- int i;
- int actual_queue_len;
-
- actual_queue_len = queue_len;
- if (actual_queue_len < 5) actual_queue_len = 5;
-
- i = unlink(sockpath);
- if (i != 0) if (errno != ENOENT) {
- lprintf(1, "webcit: can't unlink %s: %s\n",
- sockpath, strerror(errno));
- exit(WC_EXIT_BIND);
- }
-
- memset(&addr, 0, sizeof(addr));
- addr.sun_family = AF_UNIX;
- safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
-
- s = socket(AF_UNIX, SOCK_STREAM, 0);
- if (s < 0) {
- lprintf(1, "webcit: Can't create a socket: %s\n",
- strerror(errno));
- exit(WC_EXIT_BIND);
- }
-
- if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- lprintf(1, "webcit: Can't bind: %s\n",
- strerror(errno));
- exit(WC_EXIT_BIND);
- }
-
- if (listen(s, actual_queue_len) < 0) {
- lprintf(1, "webcit: Can't listen: %s\n",
- strerror(errno));
- exit(WC_EXIT_BIND);
- }
-
- chmod(sockpath, 0777);
- return(s);
-}
-
-
-
-
-/*
- * Read data from the client socket.
- *
- * sock socket fd to read from
- * buf buffer to read into
- * bytes number of bytes to read
- * timeout Number of seconds to wait before timing out
- *
- * Possible return values:
- * 1 Requested number of bytes has been read.
- * 0 Request timed out.
- * -1 Connection is broken, or other error.
- */
-int client_read_to(int *sock, char *buf, int bytes, int timeout)
-{
- int len, rlen;
- fd_set rfds;
- struct timeval tv;
- int retval;
-
-
-#ifdef HAVE_OPENSSL
- if (is_https) {
- return (client_read_ssl(buf, bytes, timeout));
- }
-#endif
-
- len = 0;
- while ((len < bytes) && (*sock > 0)) {
- FD_ZERO(&rfds);
- FD_SET(*sock, &rfds);
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
-
- retval = select((*sock) + 1, &rfds, NULL, NULL, &tv);
- if (FD_ISSET(*sock, &rfds) == 0) {
- return (0);
- }
-
- rlen = read(*sock, &buf[len], bytes - len);
-
- if (rlen < 1) {
- lprintf(2, "client_read() failed: %s\n",
- strerror(errno));
- if (*sock > 0)
- close(*sock);
- *sock = -1;
- return (-1);
- }
- len = len + rlen;
- }
-
-#ifdef HTTP_TRACING
- write(2, "\033[32m", 5);
- write(2, buf, bytes);
- write(2, "\033[30m", 5);
-#endif
- return (1);
-}
-
-
-/*
- * Begin buffering HTTP output so we can transmit it all in one write operation later.
- */
-void begin_burst(void)
-{
- if (WC->WBuf == NULL)
- WC->WBuf = NewStrBufPlain(NULL, 32768);
-}
-
-
-/*
- * Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header.
- */
-long end_burst(void)
-{
- struct wcsession *WCC = WC;
- const char *ptr, *eptr;
- long count;
- ssize_t res;
- fd_set wset;
- int fdflags;
-
-#ifdef HAVE_ZLIB
- /* Perform gzip compression, if enabled and supported by client */
- if ((WCC->gzip_ok) && CompressBuffer(WCC->WBuf))
- {
- hprintf("Content-encoding: gzip\r\n");
- }
-#endif /* HAVE_ZLIB */
-
- hprintf("Content-length: %d\r\n\r\n", StrLength(WCC->WBuf));
-
- ptr = ChrPtr(WCC->HBuf);
- count = StrLength(WCC->HBuf);
- eptr = ptr + count;
-
-#ifdef HAVE_OPENSSL
- if (is_https) {
- client_write_ssl(WCC->HBuf);
- client_write_ssl(WCC->WBuf);
- return (count);
- }
-#endif
-
-
-#ifdef HTTP_TRACING
-
- write(2, "\033[34m", 5);
- write(2, ptr, StrLength(WCC->WBuf));
- write(2, "\033[30m", 5);
-#endif
- fdflags = fcntl(WC->http_sock, F_GETFL);
-
- while (ptr < eptr) {
- if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
- FD_ZERO(&wset);
- FD_SET(WCC->http_sock, &wset);
- if (select(WCC->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
- lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
- return -1;
- }
- }
-
- if ((res = write(WCC->http_sock,
- ptr,
- count)) == -1) {
- lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
- wc_backtrace();
- return res;
- }
- count -= res;
- ptr += res;
- }
-
- ptr = ChrPtr(WCC->WBuf);
- count = StrLength(WCC->WBuf);
- eptr = ptr + count;
-
-#ifdef HTTP_TRACING
-
- write(2, "\033[34m", 5);
- write(2, ptr, StrLength(WCC->WBuf));
- write(2, "\033[30m", 5);
-#endif
-
- while (ptr < eptr) {
- if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
- FD_ZERO(&wset);
- FD_SET(WCC->http_sock, &wset);
- if (select(WCC->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
- lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
- return -1;
- }
- }
-
- if ((res = write(WCC->http_sock,
- ptr,
- count)) == -1) {
- lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
- wc_backtrace();
- return res;
- }
- count -= res;
- ptr += res;
- }
-
- return StrLength(WCC->WBuf);
-}
-
-
-
-/*
- * Read data from the client socket with default timeout.
- * (This is implemented in terms of client_read_to() and could be
- * justifiably moved out of sysdep.c)
- *
- * sock the socket fd to read from
- * buf the buffer to write to
- * bytes Number of bytes to read
- */
-int client_read(int *sock, char *buf, int bytes)
-{
- return (client_read_to(sock, buf, bytes, SLEEPING));
-}
-
-
-/*
- * Get a LF-terminated line of text from the client.
- * (This is implemented in terms of client_read() and could be
- * justifiably moved out of sysdep.c)
- *
- * sock socket fd to get client line from
- * buf buffer to write read data to
- * bufsiz how many bytes to read
- *
- * returns the number of bytes read
- */
-int client_getln(int *sock, char *buf, int bufsiz)
-{
- int i = 0;
- int retval = 0;
-
- /* Read one character at a time.*/
- for (i = 0; *sock > 0; i++) {
- retval = client_read(sock, &buf[i], 1);
- if (retval < 0)
- return retval;
- if (retval != 1 || buf[i] == '\n' || i == (bufsiz-1))
- break;
- if ( (!isspace(buf[i])) && (!isprint(buf[i])) ) {
- /* Non printable character recieved from client */
- return(-1);
- }
- }
-
- /* If we got a long line, discard characters until the newline. */
- if (i == (bufsiz-1))
- while (buf[i] != '\n' && retval == 1)
- retval = client_read(sock, &buf[i], 1);
-
- /*
- * Strip any trailing non-printable characters.
- */
- buf[i] = 0;
- while ((i > 0) && (!isprint(buf[i - 1]))) {
- buf[--i] = 0;
- }
- return (retval);
-}
/*
* Shut us down the regular way.
exit(0);
}
+
+
+
/*
* Shut us down the regular way.
* signum is the signal we want to forward
*/
pid_t current_child;
void graceful_shutdown(int signum) {
-// kill(current_child, signum);
char wd[SIZ];
FILE *FD;
int fd;
exit(errno);
}
- else if (current_child == 0) { // child process
-// signal(SIGTERM, graceful_shutdown);
+ else if (current_child == 0) { /* child process */
signal(SIGHUP, graceful_shutdown);
return; /* continue starting webcit. */
}
-
- else { // watcher process
-// signal(SIGTERM, SIG_IGN);
-// signal(SIGHUP, SIG_IGN);
+ else { /* watcher process */
if (pid_file) {
fp = fopen(pid_file, "w");
if (fp != NULL) {
pthread_attr_destroy(&attr);
}
-//#define DBG_PRINNT_HOOKS_AT_START
+/* #define DBG_PRINNT_HOOKS_AT_START */
#ifdef DBG_PRINNT_HOOKS_AT_START
const char foobuf[32];
const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
#endif
+extern int dbg_analyze_msg;
+extern int dbg_bactrace_template_errors;
+extern int DumpTemplateI18NStrings;
+extern StrBuf *I18nDump;
void InitTemplateCache(void);
extern int LoadTemplates;
-extern void LoadZoneFiles(void);
+extern HashList *HandlerHash;
+
+
+
+void
+webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdir, char *relhome)
+{
+ char dirbuffer[PATH_MAX]="";
+ /* calculate all our path on a central place */
+ /* where to keep our config */
+
+#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
+ snprintf(SUBDIR,sizeof SUBDIR, "%s%s%s%s%s%s%s", \
+ (home&!relh)?webcitdir:basedir, \
+ ((basedir!=webcitdir)&(home&!relh))?basedir:"/", \
+ ((basedir!=webcitdir)&(home&!relh))?"/":"", \
+ relhome, \
+ (relhome[0]!='\0')?"/":"",\
+ dirbuffer,\
+ (dirbuffer[0]!='\0')?"/":"");
+ basedir=RUNDIR;
+ COMPUTE_DIRECTORY(socket_dir);
+ basedir=WWWDIR "/static";
+ COMPUTE_DIRECTORY(static_dir);
+ basedir=WWWDIR "/static/icons";
+ COMPUTE_DIRECTORY(static_icon_dir);
+ basedir=WWWDIR "/static.local";
+ COMPUTE_DIRECTORY(static_local_dir);
+ StripSlashes(static_dir, 1);
+ StripSlashes(static_icon_dir, 1);
+ StripSlashes(static_local_dir, 1);
+
+ snprintf(file_crpt_file_key,
+ sizeof file_crpt_file_key,
+ "%s/citadel.key",
+ ctdl_key_dir);
+ snprintf(file_crpt_file_csr,
+ sizeof file_crpt_file_csr,
+ "%s/citadel.csr",
+ ctdl_key_dir);
+ snprintf(file_crpt_file_cer,
+ sizeof file_crpt_file_cer,
+ "%s/citadel.cer",
+ ctdl_key_dir);
+
+ /* we should go somewhere we can leave our coredump, if enabled... */
+ lprintf(9, "Changing directory to %s\n", socket_dir);
+ if (chdir(webcitdir) != 0) {
+ perror("chdir");
+ }
+}
/*
* Here's where it all begins.
*/
int main(int argc, char **argv)
{
+ size_t basesize = 2; /* how big should strbufs be on creation? */
pthread_t SessThread; /* Thread descriptor */
pthread_attr_t attr; /* Thread attributes */
int a, i; /* General-purpose variables */
char tracefile[PATH_MAX];
char ip_addr[256]="0.0.0.0";
- char dirbuffer[PATH_MAX]="";
int relh=0;
int home=0;
int home_specified=0;
char *mo = NULL;
#endif /* ENABLE_NLS */
char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */
+ const char *I18nDumpFile = NULL;
- HandlerHash = NewHash(1, NULL);
- PreferenceHooks = NewHash(1, NULL);
- WirelessTemplateCache = NewHash(1, NULL);
- WirelessLocalTemplateCache = NewHash(1, NULL);
- LocalTemplateCache = NewHash(1, NULL);
- TemplateCache = NewHash(1, NULL);
- GlobalNS = NewHash(1, NULL);
- Iterators = NewHash(1, NULL);
- Contitionals = NewHash(1, NULL);
- LoadZoneFiles();
+ WildFireInitBacktrace(argv[0], 2);
+ start_modules ();
#ifdef DBG_PRINNT_HOOKS_AT_START
- dbg_PrintHash(HandlerHash, nix, NULL);
+/* dbg_PrintHash(HandlerHash, nix, NULL);*/
#endif
/* Ensure that we are linked to the correct version of libcitadel */
/* Parse command line */
#ifdef HAVE_OPENSSL
- while ((a = getopt(argc, argv, "h:i:p:t:T:x:dD:cfs")) != EOF)
+ while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfsZ")) != EOF)
#else
- while ((a = getopt(argc, argv, "h:i:p:t:T:x:dD:cf")) != EOF)
+ while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
#endif
switch (a) {
case 'h':
pidfile = strdup(optarg);
running_as_daemon = 1;
break;
+ case 'B': /* Basesize */
+ basesize = atoi(optarg);
+ if (basesize > 2)
+ StartLibCitadel(basesize);
+ break;
case 'i':
safestrncpy(ip_addr, optarg, sizeof ip_addr);
break;
break;
case 'T':
LoadTemplates = atoi(optarg);
+ dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
+ dbg_bactrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+ break;
+ case 'Z':
+ DisableGzip = 1;
break;
case 'x':
verbosity = atoi(optarg);
case 's':
is_https = 1;
break;
+ case 'G':
+ DumpTemplateI18NStrings = 1;
+ I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n"));
+ I18nDumpFile = optarg;
+ break;
default:
fprintf(stderr, "usage: webcit "
"[-i ip_addr] [-p http_port] "
"[-t tracefile] [-c] [-f] "
"[-T Templatedebuglevel] "
- "[-d] "
+ "[-d] [-Z] [-G i18ndumpfile] "
#ifdef HAVE_OPENSSL
"[-s] "
#endif
}
/* daemonize, if we were asked to */
- if (running_as_daemon) {
+ if (!DumpTemplateI18NStrings && running_as_daemon) {
start_daemon(pidfile);
}
else {
-/// signal(SIGTERM, graceful_shutdown);
signal(SIGHUP, graceful_shutdown);
}
+ webcit_calc_dirs_n_files(relh, basedir, home, webcitdir, relhome);
+ LoadIconDir(static_icon_dir);
+
/* Tell 'em who's in da house */
lprintf(1, PACKAGE_STRING "\n");
- lprintf(1, "Copyright (C) 1996-2008 by the Citadel development team.\n"
+ lprintf(1, "Copyright (C) 1996-2009 by the Citadel development team.\n"
"This software is distributed under the terms of the "
"GNU General Public License.\n\n"
);
#ifdef ENABLE_NLS
initialize_locales();
+
locale = setlocale(LC_ALL, "");
mo = malloc(strlen(webcitdir) + 20);
free(mo);
lprintf(9, "Text domain: %s\n", textdomain("webcit"));
lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8"));
- preset_locale();
#endif
-
- /* calculate all our path on a central place */
- /* where to keep our config */
-
-#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
- snprintf(SUBDIR,sizeof SUBDIR, "%s%s%s%s%s%s%s", \
- (home&!relh)?webcitdir:basedir, \
- ((basedir!=webcitdir)&(home&!relh))?basedir:"/", \
- ((basedir!=webcitdir)&(home&!relh))?"/":"", \
- relhome, \
- (relhome[0]!='\0')?"/":"",\
- dirbuffer,\
- (dirbuffer[0]!='\0')?"/":"");
- basedir=RUNDIR;
- COMPUTE_DIRECTORY(socket_dir);
- basedir=WWWDIR "/static";
- COMPUTE_DIRECTORY(static_dir);
- basedir=WWWDIR "/static/icons";
- COMPUTE_DIRECTORY(static_icon_dir);
- basedir=WWWDIR "/static.local";
- COMPUTE_DIRECTORY(static_local_dir);
-
- snprintf(file_crpt_file_key,
- sizeof file_crpt_file_key,
- "%s/citadel.key",
- ctdl_key_dir);
- snprintf(file_crpt_file_csr,
- sizeof file_crpt_file_csr,
- "%s/citadel.csr",
- ctdl_key_dir);
- snprintf(file_crpt_file_cer,
- sizeof file_crpt_file_cer,
- "%s/citadel.cer",
- ctdl_key_dir);
-
- /* we should go somewhere we can leave our coredump, if enabled... */
- lprintf(9, "Changing directory to %s\n", socket_dir);
- if (chdir(webcitdir) != 0) {
- perror("chdir");
- }
- LoadIconDir(static_icon_dir);
- InitTemplateCache();
-
initialise_modules();
initialize_viewdefs();
initialize_axdefs();
+ InitTemplateCache();
+ if (DumpTemplateI18NStrings) {
+ FILE *fd;
+ StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
+ if (StrLength(I18nDump) < 50) {
+ lprintf(1, "********************************************************************************\n");
+ lprintf(1, "* No strings found in templates! are you shure they're there? *\n");
+ lprintf(1, "********************************************************************************\n");
+ return -1;
+ }
+ fd = fopen(I18nDumpFile, "w");
+ if (fd == NULL) {
+ lprintf(1, "********************************************************************************\n");
+ lprintf(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile);
+ lprintf(1, "********************************************************************************\n");
+ return -1;
+ }
+ fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
+ fclose(fd);
+ return 0;
+ }
+
+
/* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
icalerror_errors_are_fatal = 0;
+ /* Use our own prefix on tzid's generated from system tzdata */
+ icaltimezone_set_tzid_prefix("/citadel.org/");
+
/*
* Set up a place to put thread-specific data.
* We only need a single pointer per thread - it points to the
/* now the original thread becomes another worker */
worker_entry();
ShutDownLibCitadel ();
- DeleteHash(&HandlerHash);
- DeleteHash(&PreferenceHooks);
return 0;
}
void ShutDownWebcit(void)
{
- DeleteHash(&ZoneHash);
free_zone_directory ();
icaltimezone_release_zone_tab ();
icalmemory_free_ring ();
ShutDownLibCitadel ();
- DeleteHash(&HandlerHash);
- DeleteHash(&PreferenceHooks);
- DeleteHash(&GlobalNS);
- DeleteHash(&WirelessTemplateCache);
- DeleteHash(&WirelessLocalTemplateCache);
- DeleteHash(&TemplateCache);
- DeleteHash(&LocalTemplateCache);
- DeleteHash(&Iterators);
- DeleteHash(&Contitionals);
+ shutdown_modules ();
#ifdef ENABLE_NLS
ShutdownLocale();
#endif
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ shutdown_ssl();
+ }
+#endif
}
/*
int ret;
struct timeval tv;
fd_set readset, tempset;
+ ParsedHttpHdrs Hdr;
+
+ memset(&Hdr, 0, sizeof(ParsedHttpHdrs));
+ Hdr.HR.eReqType = eGET;
tv.tv_sec = 0;
tv.tv_usec = 10000;
if (msock > 0) ret = select(msock+1, &tempset, NULL, NULL, &tv);
end_critical_section(S_SELECT);
if ((ret < 0) && (errno != EINTR) && (errno != EAGAIN))
- {// EINTR and EAGAIN are thrown but not of interest.
+ {/* EINTR and EAGAIN are thrown but not of interest. */
lprintf(2, "accept() failed:%d %s\n",
errno, strerror(errno));
}
else if ((ret > 0) && (msock > 0) && FD_ISSET(msock, &tempset))
- {// Successfully selected, and still not shutting down? Accept!
+ {/* Successfully selected, and still not shutting down? Accept! */
ssock = accept(msock, NULL, 0);
}
} while ((msock > 0) && (ssock < 0) && (time_to_die == 0));
if ((msock == -1)||(time_to_die))
- {// ok, we're going down.
+ {/* ok, we're going down. */
int shutdown = 0;
/* the first to come here will have to do the cleanup.
}
end_critical_section(S_SHUTDOWN);
if (shutdown == 1)
- {// we're the one to cleanup the mess.
+ {/* we're the one to cleanup the mess. */
lprintf(2, "I'm master shutdown: tagging sessions to be killed.\n");
shutdown_sessions();
lprintf(2, "master shutdown: waiting for others\n");
- sleeeeeeeeeep(1); // wait so some others might finish...
+ sleeeeeeeeeep(1); /* wait so some others might finish... */
lprintf(2, "master shutdown: cleaning up sessions\n");
do_housekeeping();
lprintf(2, "master shutdown: cleaning up libical\n");
if (ssock > 0) close (ssock);
lprintf(2, "inbetween.");
pthread_exit(NULL);
- } else { // Got it? do some real work!
+ } else { /* Got it? do some real work! */
/* Set the SO_REUSEADDR socket option */
i = 1;
setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR,
close(ssock);
}
}
+ else
+ {
+ int fdflags;
+ fdflags = fcntl(ssock, F_GETFL);
+ if (fdflags < 0)
+ lprintf(1, "unable to get server socket flags! %s \n",
+ strerror(errno));
+ fdflags = fdflags | O_NONBLOCK;
+ if (fcntl(ssock, F_SETFD, fdflags) < 0)
+ lprintf(1, "unable to set server socket nonblocking flags! %s \n",
+ strerror(errno));
+ }
#endif
if (fail_this_transaction == 0) {
+ Hdr.http_sock = ssock;
/* Perform an HTTP transaction... */
- context_loop(&ssock);
+ context_loop(&Hdr);
/* Shut down SSL/TLS if required... */
#ifdef HAVE_OPENSSL
#endif
/* ...and close the socket. */
- if (ssock > 0)
+ if (Hdr.http_sock > 0)
lingering_close(ssock);
+ http_detach_modules(&Hdr);
+
}
}
} while (!time_to_die);
+ http_destroy_modules(&Hdr);
lprintf (1, "bye\n");
pthread_exit(NULL);
}
#endif
}
+
+
+