httpdate(httpnow, time(NULL));
if (do_httpheaders) {
- wprintf("Content-type: text/html\n"
+ wprintf("Content-type: text/html\r\n"
"Server: %s / %s\n", SERVER, serv_info.serv_software
);
if (!cache)
- wprintf("Connection: close\n"
- "Pragma: no-cache\n"
- "Cache-Control: no-store\n"
+ wprintf("Connection: close\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-store\r\n"
);
}
WC->wc_password, WC->wc_roomname);
if (unset_cookies) {
- wprintf("Set-cookie: webcit=%s; path=/\n", unset);
+ wprintf("Set-cookie: webcit=%s; path=/\r\n", unset);
} else {
- wprintf("Set-cookie: webcit=%s; path=/\n", cookie);
+ wprintf("Set-cookie: webcit=%s; path=/\r\n", cookie);
if (server_cookie != NULL) {
wprintf("%s\n", server_cookie);
}
*/
void http_redirect(char *whichpage) {
wprintf("HTTP/1.0 302 Moved Temporarily\n");
- wprintf("Location: %s\n", whichpage);
- wprintf("URI: %s\n", whichpage);
- wprintf("Content-type: text/html\n\n");
+ wprintf("Location: %s\r\n", whichpage);
+ wprintf("URI: %s\r\n", whichpage);
+ wprintf("Content-type: text/html\r\n\r\n");
wprintf("<html><body>\n");
wprintf("you really want to be <A HREF=\"%s\">here</A> now\n",
whichpage);
{
char buf[SIZ];
- lprintf(9, "Checking for instant messages...\n");
serv_puts("NOOP");
serv_gets(buf);
if (buf[3] == '*') WC->HaveInstantMessages = 1;
- lprintf(9, "...done\n");
}
else {
output_headers(0, 0, 0, 0, 0, 0, 0);
}
- wprintf("Content-type: %s\n"
- "Content-length: %ld\n"
- "Server: %s\n"
- "Connection: close\n"
- "\n",
+ wprintf("Content-type: %s\r\n"
+ "Content-length: %ld\r\n"
+ "Server: %s\r\n"
+ "Connection: close\r\n"
+ "\r\n",
content_type,
(long) length,
SERVER
fp = fopen(buf, "rb");
if (fp == NULL) {
wprintf("HTTP/1.0 404 %s\n", strerror(errno));
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
+ wprintf("Content-Type: text/plain\r\n");
+ wprintf("\r\n");
wprintf("Cannot open %s: %s\n", what, strerror(errno));
} else {
if (!strncasecmp(&what[strlen(what) - 4], ".gif", 4))
fstat(fileno(fp), &statbuf);
bytes = statbuf.st_size;
- /* lprintf(3, "Static: %s, (%s; %ld bytes)\n",
+ /* lprintf(3, "Static: %s, (%s; %ld bytes)\r\n",
what, content_type, bytes); */
bigbuffer = malloc(bytes + 2);
fread(bigbuffer, bytes, 1, fp);
/*
wprintf("HTTP/1.0 404 %s\n", &buf[4]);
output_headers(0, 0, 0, 0, 0, 0, 0);
- wprintf("Content-Type: text/plain\n"
- "\n"
+ wprintf("Content-Type: text/plain\r\n"
+ "\r\n"
"Error retrieving image: %s\n",
&buf[4]
);
} else {
wprintf("HTTP/1.0 404 %s\n", &buf[4]);
output_headers(0, 0, 0, 0, 0, 0, 0);
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
+ wprintf("Content-Type: text/plain\r\n");
+ wprintf("\r\n");
wprintf("Error retrieving part: %s\n", &buf[4]);
}
#include "webcit.h"
#include "webserver.h"
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif
+
#ifndef HAVE_SNPRINTF
int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
#endif
sin.sin_family = AF_INET;
if (ip_addr == NULL) {
sin.sin_addr.s_addr = INADDR_ANY;
- }
- else {
+ } else {
sin.sin_addr.s_addr = inet_addr(ip_addr);
}
s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
if (s < 0) {
- lprintf(1, "Can't create a socket: %s\n",
- strerror(errno));
+ lprintf(1, "Can't create a socket: %s\n", strerror(errno));
exit(errno);
}
/* Set some socket options that make sense. */
#ifdef HAVE_OPENSSL
if (is_https) {
- return(client_read_ssl(buf, bytes, timeout));
+ return (client_read_ssl(buf, bytes, timeout));
}
#endif
tv.tv_sec = timeout;
tv.tv_usec = 0;
- retval = select((sock) + 1,
- &rfds, NULL, NULL, &tv);
+ retval = select((sock) + 1, &rfds, NULL, NULL, &tv);
if (FD_ISSET(sock, &rfds) == 0) {
return (0);
}
if (rlen < 1) {
lprintf(2, "client_read() failed: %s\n",
- strerror(errno));
- return(-1);
+ strerror(errno));
+ return (-1);
}
len = len + rlen;
}
}
-ssize_t client_write(const void *buf, size_t count) {
+ssize_t client_write(const void *buf, size_t count)
+{
if (WC->burst != NULL) {
- WC->burst = realloc(WC->burst, (WC->burst_len + count + 2));
+ WC->burst =
+ realloc(WC->burst, (WC->burst_len + count + 2));
memcpy(&WC->burst[WC->burst_len], buf, count);
WC->burst_len += count;
- return(count);
+ return (count);
}
-
#ifdef HAVE_OPENSSL
if (is_https) {
- client_write_ssl((char *)buf, count);
- return(count);
+ client_write_ssl((char *) buf, count);
+ return (count);
}
#endif
#ifdef HTTP_TRACING
write(2, buf, count);
write(2, "\033[30m", 5);
#endif
- return(write(WC->http_sock, buf, count));
+ return (write(WC->http_sock, buf, count));
}
-void begin_burst(void) {
+void begin_burst(void)
+{
if (WC->burst != NULL) {
free(WC->burst);
WC->burst = NULL;
WC->burst = malloc(SIZ);
}
-void end_burst(void) {
+
+/*
+ * compress_gzip() uses the same calling syntax as compress2(), but it
+ * creates a stream compatible with HTTP "Content-encoding: gzip"
+ */
+#ifdef HAVE_ZLIB
+#define DEF_MEM_LEVEL 8
+#define OS_CODE 0x03 /* unix */
+int ZEXPORT compress_gzip(Bytef * dest, uLongf * destLen,
+ const Bytef * source, uLong sourceLen, int level)
+{
+ const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
+
+ /* write gzip header */
+ sprintf((char *) dest, "%c%c%c%c%c%c%c%c%c%c",
+ gz_magic[0], gz_magic[1], Z_DEFLATED,
+ 0 /*flags */ , 0, 0, 0, 0 /*time */ , 0 /*xflags */ ,
+ OS_CODE);
+
+ /* normal deflate */
+ z_stream stream;
+ int err;
+ stream.next_in = (Bytef *) source;
+ stream.avail_in = (uInt) sourceLen;
+ stream.next_out = dest + 10L; // after header
+ stream.avail_out = (uInt) * destLen;
+ if ((uLong) stream.avail_out != *destLen)
+ return Z_BUF_ERROR;
+
+ stream.zalloc = (alloc_func) 0;
+ stream.zfree = (free_func) 0;
+ stream.opaque = (voidpf) 0;
+
+ err = deflateInit2(&stream, level, Z_DEFLATED, -MAX_WBITS,
+ DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
+ if (err != Z_OK)
+ return err;
+
+ err = deflate(&stream, Z_FINISH);
+ if (err != Z_STREAM_END) {
+ deflateEnd(&stream);
+ return err == Z_OK ? Z_BUF_ERROR : err;
+ }
+ *destLen = stream.total_out + 10L;
+
+ /* write CRC and Length */
+ uLong crc = crc32(0L, source, sourceLen);
+ int n;
+ for (n = 0; n < 4; ++n, ++*destLen) {
+ dest[*destLen] = (int) (crc & 0xff);
+ crc >>= 8;
+ }
+ uLong len = stream.total_in;
+ for (n = 0; n < 4; ++n, ++*destLen) {
+ dest[*destLen] = (int) (len & 0xff);
+ len >>= 8;
+ }
+ err = deflateEnd(&stream);
+ return err;
+}
+#endif
+
+void end_burst(void)
+{
size_t the_len;
char *the_data;
- if (WC->burst == NULL) return;
+ if (WC->burst == NULL)
+ return;
the_len = WC->burst_len;
the_data = WC->burst;
WC->burst_len = 0;
WC->burst = NULL;
+#ifdef HAVE_ZLIB
+ /* Handle gzip compression */
+ if (WC->gzip_ok) {
+ char *compressed_data = NULL;
+ uLongf compressed_len;
+
+ compressed_len = (uLongf) ((the_len * 101) / 100) + 100;
+ compressed_data = malloc(compressed_len);
+
+ if (compress_gzip((Bytef *) compressed_data,
+ &compressed_len,
+ (Bytef *) the_data,
+ (uLongf) the_len, 9) == Z_OK) {
+ wprintf("Content-encoding: gzip\r\n");
+ free(the_data);
+ the_data = compressed_data;
+ the_len = compressed_len;
+ } else {
+ free(compressed_data);
+ }
+ }
+#endif /* HAVE_ZLIB */
+
wprintf("Content-length: %d\r\n\r\n", the_len);
client_write(the_data, the_len);
free(the_data);
+ return;
}
exit(0);
}
-void spawn_another_worker_thread() {
+void spawn_another_worker_thread()
+{
pthread_t SessThread; /* Thread descriptor */
pthread_attr_t attr; /* Thread attributes */
int ret;
* 64-bit Linux.
*/
if ((ret = pthread_attr_setstacksize(&attr, 1024 * 1024))) {
- lprintf(1, "pthread_attr_setstacksize: %s\n", strerror(ret));
+ lprintf(1, "pthread_attr_setstacksize: %s\n",
+ strerror(ret));
pthread_attr_destroy(&attr);
}
/* now create the thread */
if (pthread_create(&SessThread, &attr,
- (void *(*)(void *)) worker_entry, NULL)
- != 0) {
- lprintf(1, "Can't create thread: %s\n",
- strerror(errno));
+ (void *(*)(void *)) worker_entry, NULL)
+ != 0) {
+ lprintf(1, "Can't create thread: %s\n", strerror(errno));
}
/* free up the attributes */
case 'c':
server_cookie = malloc(SIZ);
if (server_cookie != NULL) {
- strcpy(server_cookie, "Set-cookie: wcserver=");
- if (gethostname(
- &server_cookie[strlen(server_cookie)],
- 200) != 0) {
+ strcpy(server_cookie,
+ "Set-cookie: wcserver=");
+ if (gethostname
+ (&server_cookie[strlen(server_cookie)],
+ 200) != 0) {
lprintf(2, "gethostname: %s\n",
strerror(errno));
free(server_cookie);
}
/* Tell 'em who's in da house */
lprintf(1, SERVER "\n"
-"Copyright (C) 1996-2005 by the Citadel/UX development team.\n"
-"This software is distributed under the terms of the GNU General Public\n"
-"License. If you paid for this software, someone is ripping you off.\n\n");
+ "Copyright (C) 1996-2005 by the Citadel/UX development team.\n"
+ "This software is distributed under the terms of the GNU General Public\n"
+ "License. If you paid for this software, someone is ripping you off.\n\n");
if (chdir(WEBCITDIR) != 0)
perror("chdir");
- /*
- * Set up a place to put thread-specific data.
- * We only need a single pointer per thread - it points to the
- * wcsession struct to which the thread is currently bound.
- */
- if (pthread_key_create(&MyConKey, NULL) != 0) {
- lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
- }
+ /*
+ * Set up a place to put thread-specific data.
+ * We only need a single pointer per thread - it points to the
+ * wcsession struct to which the thread is currently bound.
+ */
+ if (pthread_key_create(&MyConKey, NULL) != 0) {
+ lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ }
/*
* Set up a place to put thread-specific SSL data.
* transactions.
*/
#ifdef HAVE_OPENSSL
- if (pthread_key_create(&ThreadSSL, NULL) != 0) {
- lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
- }
+ if (pthread_key_create(&ThreadSSL, NULL) != 0) {
+ lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ }
#endif
/*
#endif
/* Start a few initial worker threads */
- for (i=0; i<(MIN_WORKER_THREADS); ++i) {
+ for (i = 0; i < (MIN_WORKER_THREADS); ++i) {
spawn_another_worker_thread();
}
/*
* Entry point for worker threads
*/
-void worker_entry(void) {
+void worker_entry(void)
+{
int ssock;
int i = 0;
int time_to_die = 0;
fail_this_transaction = 0;
ssock = accept(msock, NULL, 0);
if (ssock < 0) {
- lprintf(2, "accept() failed: %s\n", strerror(errno));
+ lprintf(2, "accept() failed: %s\n",
+ strerror(errno));
} else {
/* Set the SO_REUSEADDR socket option */
i = 1;
setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR,
- &i, sizeof(i));
+ &i, sizeof(i));
/* If we are an HTTPS server, go crypto now. */
#ifdef HAVE_OPENSSL
projects / citadel.git / commitdiff