projects
/
project
/
uhttpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubus: add CORS header support
[project/uhttpd.git]
/
client.c
diff --git
a/client.c
b/client.c
index
d1584f9
..
9b8fb07
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-24,6
+24,7
@@
#include "tls.h"
static LIST_HEAD(clients);
#include "tls.h"
static LIST_HEAD(clients);
+static bool client_done = false;
int n_clients = 0;
struct config conf = {};
int n_clients = 0;
struct config conf = {};
@@
-38,6
+39,7
@@
const char * const http_methods[] = {
[UH_HTTP_MSG_GET] = "GET",
[UH_HTTP_MSG_POST] = "POST",
[UH_HTTP_MSG_HEAD] = "HEAD",
[UH_HTTP_MSG_GET] = "GET",
[UH_HTTP_MSG_POST] = "POST",
[UH_HTTP_MSG_HEAD] = "HEAD",
+ [UH_HTTP_MSG_OPTIONS] = "OPTIONS",
};
void uh_http_header(struct client *cl, int code, const char *summary)
};
void uh_http_header(struct client *cl, int code, const char *summary)
@@
-73,6
+75,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
+112,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
+182,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
+197,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);
@@
-286,8
+295,6
@@
static void client_parse_header(struct client *cl, char *data)
} else if (!strcmp(data, "connection")) {
if (!strcasecmp(val, "close"))
r->connection_close = true;
} 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;
} else if (!strcmp(data, "user-agent")) {
char *str;
@@
-307,10
+314,11
@@
static void client_parse_header(struct client *cl, char *data)
break;
}
}
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, "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"))
else if (strstr(val, "Gecko/"))
r->ua = UH_UA_GECKO;
else if (strstr(val, "Konqueror"))
@@
-436,6
+444,7
@@
void uh_client_read_cb(struct client *cl)
char *str;
int len;
char *str;
int len;
+ client_done = false;
do {
str = ustream_get_read_buf(us, &len);
if (!str || !len)
do {
str = ustream_get_read_buf(us, &len);
if (!str || !len)
@@
-450,11
+459,17
@@
void uh_client_read_cb(struct client *cl)
uh_header_error(cl, 413, "Request Entity Too Large");
break;
}
uh_header_error(cl, 413, "Request Entity Too Large");
break;
}
- } while
(1
);
+ } while
(!client_done
);
}
static void client_close(struct client *cl)
{
}
static void client_close(struct client *cl)
{
+ if (cl->refcount) {
+ cl->state = CLIENT_STATE_CLEANUP;
+ return;
+ }
+
+ client_done = true;
n_clients--;
uh_dispatch_done(cl);
uloop_timeout_cancel(&cl->timeout);
n_clients--;
uh_dispatch_done(cl);
uloop_timeout_cancel(&cl->timeout);
@@
-473,7
+488,7
@@
void uh_client_notify_state(struct client *cl)
{
struct ustream *s = cl->us;
{
struct ustream *s = cl->us;
- if (!s->write_error) {
+ if (!s->write_error
&& cl->state != CLIENT_STATE_CLEANUP
) {
if (cl->state == CLIENT_STATE_DATA)
return;
if (cl->state == CLIENT_STATE_DATA)
return;
@@
-486,14
+501,14
@@
void uh_client_notify_state(struct client *cl)
static void client_ustream_read_cb(struct ustream *s, int bytes)
{
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)
{
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);
if (cl->dispatch.write_cb)
cl->dispatch.write_cb(cl);
@@
-501,7
+516,7
@@
static void client_ustream_write_cb(struct ustream *s, int bytes)
static void client_notify_state(struct ustream *s)
{
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);
}
uh_client_notify_state(cl);
}
@@
-563,6
+578,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;
}