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

. default_reply() ensures reply_type is REPLY_GENERATED

Browse Source 
. Implemented poll_send_header()
. Partial implementation of poll_send_file() - can't send FROMFILE yet
This commit is contained in:
Emil Mikulic 2003-02-27 03:58:42 +00:00
parent 23b191239e
commit cb3342472b
1 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
trunk/darkhttpd.c
View File

@ -319,6 +319,7 @@ static void default_reply(struct connection *conn,
errcode, errname, pkgname, conn->reply_length); errcode, errname, pkgname, conn->reply_length);
if (conn->header == NULL) errx(1, "out of memory in asprintf()"); if (conn->header == NULL) errx(1, "out of memory in asprintf()");
conn->reply_type = REPLY_GENERATED;
} }
@ -328,14 +329,14 @@ static void default_reply(struct connection *conn,
*/ */
static void process_request(struct connection *conn) static void process_request(struct connection *conn)
{ {
debugf(conn->request); debugf("%s", conn->request);
default_reply(conn, 501, "Not Implemented"); default_reply(conn, 501, "Not Implemented");
conn->state = DONE; /* FIXME: SEND_HEADER */ conn->state = SEND_HEADER;
#if 1 free(conn->request);
debugf("%s%s---\n", conn->header, conn->reply); conn->request = NULL;
#endif debugf("%s-=-\n", conn->header);
} }
@ -375,11 +376,55 @@ static void poll_recv_request(struct connection *conn)
/* ---------------------------------------------------------------------------
* Sending header.
*/
static void poll_send_header(struct connection *conn) static void poll_send_header(struct connection *conn)
{} {
ssize_t sent = send(conn->socket, conn->header + conn->header_sent,
conn->header_length - conn->header_sent, 0);
if (sent == -1) err(1, "send()");
if (sent == 0)
{
conn->state = DONE;
return;
}
conn->header_sent += (unsigned int)sent;
/* check if we're done sending */
if (conn->header_sent == conn->header_length)
{
if (!conn->header_dont_free) free(conn->header);
conn->header = NULL;
conn->state = SEND_REPLY;
}
}
/* ---------------------------------------------------------------------------
* Sending reply. (FIXME: FROM FILE)
*/
static void poll_send_reply(struct connection *conn) static void poll_send_reply(struct connection *conn)
{} {
ssize_t sent = send(conn->socket, conn->reply + conn->reply_sent,
conn->reply_length - conn->reply_sent, 0);
if (sent == -1) err(1, "send()");
if (sent == 0)
{
conn->state = DONE;
return;
}
conn->reply_sent += (unsigned int)sent;
/* check if we're done sending */
if (conn->reply_sent == conn->reply_length)
{
if (!conn->reply_dont_free) free(conn->reply);
conn->reply = NULL;
conn->state = DONE;
}
}