On 02/28/2017 12:20 AM, Eric Blake wrote: > On 02/27/2017 02:14 PM, Daniel P. Berrange wrote: >> According to RFC7230 Section 3.2, header field name is case-insensitive. >> Convert the header data into all lowercase before doing string matching >> on the headers. >> >> Signed-off-by: Daniel P. Berrange <[email protected]> >> --- >> io/channel-websock.c | 14 +++++++++----- >> 1 file changed, 9 insertions(+), 5 deletions(-) >> >> @@ -223,7 +223,7 @@ static int >> qio_channel_websock_handshake_process(QIOChannelWebsock *ioc, >> static int qio_channel_websock_handshake_read(QIOChannelWebsock *ioc, >> Error **errp) >> { >> - char *handshake_end; >> + char *handshake_end, *tmp; >> ssize_t ret; >> /* Typical HTTP headers from novnc are 512 bytes, so limiting >> * total header size to 4096 is easily enough. */ > Drive-by grammar nit: s/easily/easy/ > >> @@ -249,9 +249,13 @@ static int >> qio_channel_websock_handshake_read(QIOChannelWebsock *ioc, >> } >> } >> >> + for (tmp = (char *)ioc->encinput.buffer; tmp < handshake_end; tmp++) { >> + *tmp = g_ascii_tolower(*tmp); >> + } >> + >> if (qio_channel_websock_handshake_process(ioc, >> (char *)ioc->encinput.buffer, >> - ioc->encinput.offset, >> + handshake_end - (char >> *)ioc->encinput.buffer, > I'm not sure why this change is here; nothing else in the patch changed > ioc->encinput.offset. > yep. The rest seems fine to me.
Usage of g_ascii_strdown () seems overkill now. We do not need the header anymore after this call. Den
