mirror/darkhttpd
1
0
Fork 0
mirror of https://github.com/emikulic/darkhttpd.git synced 2023-08-10 21:13:08 +03:00
Code Issues Projects Releases Wiki Activity

. Tested If-Modified-Since functionality

Browse Source 
. Update last_active so connections don't time out
  (this also tested out the timeout functionality)
. Sprinkling of debugf()s
This commit is contained in:
Emil Mikulic 2003-06-04 14:56:29 +00:00
parent ce7cfceabb
commit 70cbd12463
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
trunk/darkhttpd.c
View File

@ -15,7 +15,7 @@
* x Log to file. * x Log to file.
* . Partial content. * . Partial content.
* x If-Modified-Since. * x If-Modified-Since.
* . Test If-Mod-Since with IE, Phoenix, lynx, links * x Test If-Mod-Since with IE, Phoenix, lynx, links, Opera
* . Keep-alive connections. * . Keep-alive connections.
* . Chroot, set{uid|gid}. * . Chroot, set{uid|gid}.
* . Port to Win32. * . Port to Win32.
@ -83,7 +83,7 @@ struct connection
FILE *reply_file; FILE *reply_file;
unsigned int reply_sent, reply_length; unsigned int reply_sent, reply_length;
unsigned int total_sent; unsigned int total_sent; /* header + body = total, for logging */
}; };
@ -101,7 +101,8 @@ struct mime_mapping
/* If a connection is idle for IDLETIME seconds or more, it gets closed and /* If a connection is idle for IDLETIME seconds or more, it gets closed and
* removed from the connlist. * removed from the connlist. Define to 0 to remove the timeout
* functionality.
*/ */
#define IDLETIME 60 #define IDLETIME 60
@ -724,8 +725,13 @@ static void strntoupper(char *str, const size_t length)
*/ */
static void poll_check_timeout(struct connection *conn) static void poll_check_timeout(struct connection *conn)
{ {
#if IDLETIME > 0
if (time(NULL) - conn->last_active >= IDLETIME) if (time(NULL) - conn->last_active >= IDLETIME)
{
debugf("poll_check_timeout(%d) caused closure\n", conn->socket);
conn->state = DONE; conn->state = DONE;
}
#endif
} }
@ -1032,6 +1038,7 @@ static void poll_recv_request(struct connection *conn)
ssize_t recvd; ssize_t recvd;
recvd = recv(conn->socket, buf, BUFSIZE, 0); recvd = recv(conn->socket, buf, BUFSIZE, 0);
debugf("poll_recv_request(%d) got %d bytes\n", conn->socket, recvd);
if (recvd == -1) err(1, "recv()"); if (recvd == -1) err(1, "recv()");
if (recvd == 0) if (recvd == 0)
{ {
@ -1075,6 +1082,8 @@ static void poll_send_header(struct connection *conn)
sent = send(conn->socket, conn->header + conn->header_sent, sent = send(conn->socket, conn->header + conn->header_sent,
conn->header_length - conn->header_sent, 0); conn->header_length - conn->header_sent, 0);
conn->last_active = time(NULL);
debugf("poll_send_header(%d) sent %d bytes\n", conn->socket, sent);
if (sent == -1) err(1, "send()"); if (sent == -1) err(1, "send()");
if (sent == 0) if (sent == 0)
{ {
@ -1131,6 +1140,9 @@ static void poll_send_reply(struct connection *conn)
sent = send(conn->socket, buf, amount, 0); sent = send(conn->socket, buf, amount, 0);
} }
conn->last_active = time(NULL);
debugf("poll_send_reply(%d) sent %d bytes [%d to %d]\n",
conn->socket, sent, conn->reply_sent, conn->reply_sent+sent-1);
/* handle any errors in send() */ /* handle any errors in send() */
if (sent == -1) err(1, "send()"); if (sent == -1) err(1, "send()");