#include "tls.h"
static LIST_HEAD(clients);
+static bool client_done = false;
int n_clients = 0;
struct config conf = {};
{
if (cl->dispatch.free)
cl->dispatch.free(cl);
+ if (cl->dispatch.req_free)
+ cl->dispatch.req_free(cl);
}
static void client_timeout(struct uloop_timeout *timeout)
{
uh_chunk_eof(cl);
uh_dispatch_done(cl);
- cl->us->notify_write = NULL;
memset(&cl->dispatch, 0, sizeof(cl->dispatch));
if (!conf.http_keepalive || cl->request.connection_close)
req->method = h_method;
req->version = h_version;
- if (req->version < UH_HTTP_VER_1_1 || !conf.http_keepalive)
+ if (req->version < UH_HTTP_VER_1_1 || req->method == UH_HTTP_MSG_POST ||
+ !conf.http_keepalive)
req->connection_close = true;
return CLIENT_STATE_HEADER;
if (!newline)
return false;
+ if (newline == buf) {
+ ustream_consume(cl->us, 2);
+ return true;
+ }
+
*newline = 0;
blob_buf_init(&cl->hdr, 0);
cl->state = client_parse_request(cl, buf);
} else if (!strcmp(data, "connection")) {
if (!strcasecmp(val, "close"))
r->connection_close = true;
- else if (!strcasecmp(val, "keep-alive"))
- r->connection_close = false;
} else if (!strcmp(data, "user-agent")) {
char *str;
break;
}
}
- } else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
- r->ua = UH_UA_SAFARI;
+ }
else if (strstr(val, "Chrome/"))
r->ua = UH_UA_CHROME;
+ else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
+ r->ua = UH_UA_SAFARI;
else if (strstr(val, "Gecko/"))
r->ua = UH_UA_GECKO;
else if (strstr(val, "Konqueror"))
char *str;
int len;
+ client_done = false;
do {
str = ustream_get_read_buf(us, &len);
if (!str || !len)
uh_header_error(cl, 413, "Request Entity Too Large");
break;
}
- } while(1);
+ } while (!client_done);
}
static void client_close(struct client *cl)
{
+ client_done = true;
n_clients--;
uh_dispatch_done(cl);
uloop_timeout_cancel(&cl->timeout);
static void client_ustream_read_cb(struct ustream *s, int bytes)
{
- struct client *cl = container_of(s, struct client, sfd);
+ struct client *cl = container_of(s, struct client, sfd.stream);
uh_client_read_cb(cl);
}
static void client_ustream_write_cb(struct ustream *s, int bytes)
{
- struct client *cl = container_of(s, struct client, sfd);
+ struct client *cl = container_of(s, struct client, sfd.stream);
if (cl->dispatch.write_cb)
cl->dispatch.write_cb(cl);
static void client_notify_state(struct ustream *s)
{
- struct client *cl = container_of(s, struct client, sfd);
+ struct client *cl = container_of(s, struct client, sfd.stream);
uh_client_notify_state(cl);
}
next_client = NULL;
n_clients++;
cl->id = client_id++;
+ cl->tls = tls;
return true;
}