projects
/
project
/
uhttpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable keep-alive for POST requests to improve compatibility
[project/uhttpd.git]
/
client.c
diff --git
a/client.c
b/client.c
index
bcb6897
..
15f3d8c
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-73,6
+73,8
@@
static void uh_dispatch_done(struct client *cl)
{
if (cl->dispatch.free)
cl->dispatch.free(cl);
{
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)
}
static void client_timeout(struct uloop_timeout *timeout)
@@
-108,7
+110,6
@@
void uh_request_done(struct client *cl)
{
uh_chunk_eof(cl);
uh_dispatch_done(cl);
{
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)
memset(&cl->dispatch, 0, sizeof(cl->dispatch));
if (!conf.http_keepalive || cl->request.connection_close)
@@
-179,7
+180,8
@@
static int client_parse_request(struct client *cl, char *data)
req->method = h_method;
req->version = h_version;
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;
req->connection_close = true;
return CLIENT_STATE_HEADER;
@@
-193,6
+195,11
@@
static bool client_init_cb(struct client *cl, char *buf, int len)
if (!newline)
return false;
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);
*newline = 0;
blob_buf_init(&cl->hdr, 0);
cl->state = client_parse_request(cl, buf);
@@
-563,6
+570,7
@@
bool uh_accept_client(int fd, bool tls)
next_client = NULL;
n_clients++;
cl->id = client_id++;
next_client = NULL;
n_clients++;
cl->id = client_id++;
+ cl->tls = tls;
return true;
}
return true;
}