stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

lws_return_http_status send content length

Browse source 
If we're sending content, we must do so with a
content-length on http/1.1

Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2016-02-20 07:53:24 +08:00
parent e34512e5e9
commit c6b0b607d4
1 changed files with 15 additions and 6 deletions

21
lib/header.c
View file

@ -173,18 +173,23 @@ lws_add_http_header_status(struct lws *wsi, unsigned int code,
* consistently * consistently
*/ */
LWS_VISIBLE int LWS_VISIBLE int
lws_return_http_status(struct lws *wsi, unsigned int code, const char *html_body) lws_return_http_status(struct lws *wsi, unsigned int code,
const char *html_body)
{ {
int n, m;
struct lws_context *context = lws_get_context(wsi); struct lws_context *context = lws_get_context(wsi);
struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi]; struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi];
unsigned char *p = pt->serv_buf + LWS_PRE; unsigned char *p = pt->serv_buf + LWS_PRE;
unsigned char *start = p; unsigned char *start = p, *body = p + 512;
unsigned char *end = p + LWS_MAX_SOCKET_IO_BUF - LWS_PRE; unsigned char *end = p + LWS_MAX_SOCKET_IO_BUF - LWS_PRE;
int n, m, len;
char slen[20];
if (!html_body) if (!html_body)
html_body = ""; html_body = "";
len = sprintf((char *)body, "<html><body><h1>%u</h1>%s</body></html>",
code, html_body);
if (lws_add_http_header_status(wsi, code, &p, end)) if (lws_add_http_header_status(wsi, code, &p, end))
return 1; return 1;
if (lws_add_http_header_by_token(wsi, WSI_TOKEN_HTTP_SERVER, if (lws_add_http_header_by_token(wsi, WSI_TOKEN_HTTP_SERVER,
@ -195,6 +200,12 @@ lws_return_http_status(struct lws *wsi, unsigned int code, const char *html_body
(unsigned char *)"text/html", 9, (unsigned char *)"text/html", 9,
&p, end)) &p, end))
return 1; return 1;
n = sprintf(slen, "%d", len);
if (lws_add_http_header_by_token(wsi, WSI_TOKEN_HTTP_CONTENT_LENGTH,
(unsigned char *)slen, n,
&p, end))
return 1;
if (lws_finalize_http_header(wsi, &p, end)) if (lws_finalize_http_header(wsi, &p, end))
return 1; return 1;
@ -202,9 +213,7 @@ lws_return_http_status(struct lws *wsi, unsigned int code, const char *html_body
if (m != (int)(p - start)) if (m != (int)(p - start))
return 1; return 1;
n = sprintf((char *)start, "<html><body><h1>%u</h1>%s</body></html>", m = lws_write(wsi, body, len, LWS_WRITE_HTTP);
code, html_body);
m = lws_write(wsi, start, n, LWS_WRITE_HTTP);
return m != n; return m != n;
} }