Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-23 00:00:06 +01:00
Code Issues Releases Wiki Activity

h2: use vhost headers with tolower adaptation

Browse source 
h2 was not applying vhost headers, make it do so.

Also adapt any header names to lower-case as required by h2.
This commit is contained in:
Andy Green 2018-08-24 16:08:18 +08:00
parent 1a44e20b6a
commit 446c790525
3 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/roles/h2/hpack.c
View file

@ -1356,8 +1356,12 @@ int lws_add_http2_header_by_name(struct lws *wsi, const unsigned char *name,
*((*p)++) = 0 | lws_h2_num_start(7, len); /* non-HUF */ *((*p)++) = 0 | lws_h2_num_start(7, len); /* non-HUF */
if (lws_h2_num(7, len, p, end)) if (lws_h2_num(7, len, p, end))
return 1; return 1;
memcpy(*p, name, len);
*p += len; /* upper-case header names are verboten in h2, but OK on h1, so
* they're not illegal per se. Silently convert them for h2... */
while(len--)
*((*p)++) = tolower((int)*name++);
*((*p)++) = 0 | lws_h2_num_start(7, length); /* non-HUF */ *((*p)++) = 0 | lws_h2_num_start(7, length); /* non-HUF */
if (lws_h2_num(7, length, p, end)) if (lws_h2_num(7, length, p, end))
@ -1366,8 +1370,6 @@ int lws_add_http2_header_by_name(struct lws *wsi, const unsigned char *name,
memcpy(*p, value, length); memcpy(*p, value, length);
*p += length; *p += length;
//lwsl_hexdump(op, *p -op);
return 0; return 0;
} }

16
lib/roles/http/header.c
View file

@ -212,9 +212,13 @@ lws_add_http_header_status(struct lws *wsi, unsigned int _code,
#endif #endif
#ifdef LWS_WITH_HTTP2 #ifdef LWS_WITH_HTTP2
if (lwsi_role_h2(wsi) || lwsi_role_h2_ENCAPSULATION(wsi)) if (lwsi_role_h2(wsi) || lwsi_role_h2_ENCAPSULATION(wsi)) {
return lws_add_http2_header_status(wsi, code, p, end); n = lws_add_http2_header_status(wsi, code, p, end);
if (n)
return n;
} else
#endif #endif
{
if (code >= 400 && code < (400 + LWS_ARRAY_SIZE(err400))) if (code >= 400 && code < (400 + LWS_ARRAY_SIZE(err400)))
description = err400[code - 400]; description = err400[code - 400];
if (code >= 500 && code < (500 + LWS_ARRAY_SIZE(err500))) if (code >= 500 && code < (500 + LWS_ARRAY_SIZE(err500)))
@ -235,11 +239,13 @@ lws_add_http_header_status(struct lws *wsi, unsigned int _code,
else else
p1 = hver[0]; p1 = hver[0];
n = sprintf((char *)code_and_desc, "%s %u %s", p1, code, description); n = sprintf((char *)code_and_desc, "%s %u %s", p1, code,
description);
if (lws_add_http_header_by_name(wsi, NULL, code_and_desc, n, p, end)) if (lws_add_http_header_by_name(wsi, NULL, code_and_desc, n, p,
end))
return 1; return 1;
}
headers = wsi->vhost->headers; headers = wsi->vhost->headers;
while (headers) { while (headers) {
if (lws_add_http_header_by_name(wsi, if (lws_add_http_header_by_name(wsi,

2
lib/roles/http/server/lejp-conf.c
View file

@ -423,7 +423,7 @@ lejp_vhosts_cb(struct lejp_ctx *ctx, char reason)
headers->next = a->info->headers; headers->next = a->info->headers;
a->info->headers = headers; a->info->headers = headers;
headers->name = a->p; headers->name = a->p;
// lwsl_notice(" adding header %s=%s\n", a->p, ctx->buf); lwsl_notice(" adding header %s=%s\n", a->p, ctx->buf);
a->p += n - 1; a->p += n - 1;
*(a->p++) = ':'; *(a->p++) = ':';
if (a->p < a->end) if (a->p < a->end)