struct client *cl = container_of(timeout, struct client, timeout);
cl->state = CLIENT_STATE_CLOSE;
- uh_connection_close(cl);
+ cl->request.connection_close = true;
+ uh_request_done(cl);
}
static void uh_set_client_timeout(struct client *cl, int timeout)
void __printf(4, 5)
uh_client_error(struct client *cl, int code, const char *summary, const char *fmt, ...)
{
+ struct http_request *r = &cl->request;
va_list arg;
uh_http_header(cl, code, summary);
va_end(arg);
}
+ /* Close the connection even when keep alive is set, when it
+ * contains a request body, as it was not read and we are
+ * currently out of sync. Without handling this the body will be
+ * interpreted as part of the next request. The alternative
+ * would be to read and discard the request body here.
+ */
+ if (r->transfer_chunked || r->content_length > 0) {
+ cl->state = CLIENT_STATE_CLOSE;
+ cl->request.connection_close = true;
+ }
+
uh_request_done(cl);
}
req->method = h_method;
req->version = h_version;
- if (req->version < UH_HTTP_VER_1_1 || req->method == UH_HTTP_MSG_POST ||
- !conf.http_keepalive)
+ if (req->version < UH_HTTP_VER_1_1 || !conf.http_keepalive)
req->connection_close = true;
return CLIENT_STATE_HEADER;
return true;
blob_for_each_attr(cur, cl->hdr.head, rem) {
- if (!strcmp(blobmsg_name(cur), "host"))
+ if (!strncmp(blobmsg_name(cur), "host", 4))
host = blobmsg_get_string(cur);
- if (!strcmp(blobmsg_name(cur), "URL"))
+ if (!strncmp(blobmsg_name(cur), "URL", 3))
url = blobmsg_get_string(cur);
if (url && host)
}
} else if (!strcmp(data, "content-length")) {
r->content_length = strtoul(val, &err, 0);
- if (err && *err) {
+ if ((err && *err) || r->content_length < 0) {
uh_header_error(cl, 400, "Bad Request");
return;
}
{
struct dispatch *d = &cl->dispatch;
struct http_request *r = &cl->request;
+ enum client_state st;
char *buf;
int len;
ustream_consume(cl->us, sep + 2 - buf);
/* invalid chunk length */
- if (sep && *sep) {
+ if ((sep && *sep) || r->content_length < 0) {
r->content_length = 0;
r->transfer_chunked = 0;
break;
buf = ustream_get_read_buf(cl->us, &len);
if (!r->content_length && !r->transfer_chunked &&
cl->state != CLIENT_STATE_DONE) {
+ st = cl->state;
+
if (cl->dispatch.data_done)
cl->dispatch.data_done(cl);
- cl->state = CLIENT_STATE_DONE;
+ if (cl->state == st)
+ cl->state = CLIENT_STATE_DONE;
}
}
if (!read_cbs[cl->state](cl, str, len)) {
if (len == us->r.buffer_len &&
- cl->state != CLIENT_STATE_DATA)
+ cl->state != CLIENT_STATE_DATA &&
+ cl->state != CLIENT_STATE_DONE)
uh_header_error(cl, 413, "Request Entity Too Large");
break;
}
if (!s->eof || s->w.data_bytes)
return;
+#ifdef HAVE_TLS
if (cl->tls && cl->ssl.conn && cl->ssl.conn->w.data_bytes) {
cl->ssl.conn->eof = s->eof;
if (!ustream_write_pending(cl->ssl.conn))
return;
}
+#endif
}
return client_close(cl);